Page MenuHomeFreeBSD
Files F135969552

D30476.id.diff
No OneTemporary
Actions

D30476.id.diff
View Options

diff --git a/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c b/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c
--- a/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c
+++ b/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c
@@ -98,7 +98,7 @@
if (gid_attr.ndev) {
vlan_tag = rdma_vlan_dev_vlan_id(gid_attr.ndev);
memcpy(ah->av.eth.s_mac, IF_LLADDR(gid_attr.ndev), ETH_ALEN);
- dev_put(gid_attr.ndev);
+ if_rele(gid_attr.ndev);
}
if (vlan_tag < 0x1000)
vlan_tag |= (ah_attr->sl & 7) << 13;
diff --git a/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c b/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
--- a/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
+++ b/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
@@ -156,7 +156,7 @@
}
#endif
if (dev)
- dev_hold(dev);
+ if_ref(dev);
rcu_read_unlock();
return dev;
@@ -415,7 +415,7 @@
return ret;
if (attr.ndev)
- dev_put(attr.ndev);
+ if_rele(attr.ndev);
if (!memcmp(&gid, &zgid, sizeof(gid)))
return -EINVAL;
@@ -736,7 +736,8 @@
tmp = iboe_get_mtu(ndev->if_mtu);
props->active_mtu = tmp ? min(props->max_mtu, tmp) : IB_MTU_256;
- props->state = (netif_running(ndev) && netif_carrier_ok(ndev)) ?
+ props->state = ((ndev->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
+ ndev->if_link_state == LINK_STATE_UP) ?
IB_PORT_ACTIVE : IB_PORT_DOWN;
props->phys_state = state_to_phys_state(props->state);
out_unlock:
@@ -1356,12 +1357,12 @@
spin_lock_bh(&mdev->iboe.lock);
ndev = mdev->iboe.netdevs[mqp->port - 1];
if (ndev)
- dev_hold(ndev);
+ if_ref(ndev);
spin_unlock_bh(&mdev->iboe.lock);
if (ndev) {
ret = 1;
- dev_put(ndev);
+ if_rele(ndev);
}
return ret;
@@ -2002,10 +2003,10 @@
spin_lock_bh(&mdev->iboe.lock);
ndev = ge->added ? mdev->iboe.netdevs[ge->port - 1] : NULL;
if (ndev)
- dev_hold(ndev);
+ if_ref(ndev);
spin_unlock_bh(&mdev->iboe.lock);
if (ndev)
- dev_put(ndev);
+ if_rele(ndev);
list_del(&ge->list);
kfree(ge);
} else
@@ -2372,7 +2373,7 @@
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
struct mlx4_ib_dev *ibdev;
- if (!net_eq(dev_net(dev), &init_net))
+ if (dev->if_vnet != &init_net)
return NOTIFY_DONE;
ibdev = container_of(this, struct mlx4_ib_dev, iboe.nb);
@@ -3111,8 +3112,8 @@
continue;
curr_port_state =
- (netif_running(curr_netdev) &&
- netif_carrier_ok(curr_netdev)) ?
+ ((curr_netdev->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
+ curr_netdev->if_link_state == LINK_STATE_UP) ?
IB_PORT_ACTIVE : IB_PORT_DOWN;
bonded_port_state = (bonded_port_state != IB_PORT_ACTIVE) ?
diff --git a/sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c b/sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
--- a/sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
+++ b/sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c
@@ -1783,7 +1783,7 @@
if (!status && gid_attr.ndev) {
vlan = rdma_vlan_dev_vlan_id(gid_attr.ndev);
memcpy(smac, IF_LLADDR(gid_attr.ndev), ETH_ALEN);
- dev_put(gid_attr.ndev);
+ if_rele(gid_attr.ndev);
}
}
if (status)
@@ -2471,7 +2471,7 @@
&gid_attr);
if (!err) {
if (gid_attr.ndev)
- dev_put(gid_attr.ndev);
+ if_rele(gid_attr.ndev);
if (!memcmp(&sgid, &zgid, sizeof(sgid)))
err = -ENOENT;
}
@@ -2962,7 +2962,7 @@
ah->av.ib.gid_index, &gid,
&gid_attr)) {
if (gid_attr.ndev)
- dev_put(gid_attr.ndev);
+ if_rele(gid_attr.ndev);
qp = (gid_attr.gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP) ?
to_mqp(sqp->roce_v2_gsi) : qp;
} else {

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 15, 4:31 PM (15 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25332494
Default Alt Text
D30476.id.diff (3 KB)

Event Timeline