aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/nes/nes_cm.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-03 22:49:00 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-04 13:31:50 -0800
commit7f6e7101dfcc228151779354f6cdc5e1d62f576b (patch)
tree483d50edbd4903d019e5f8d589519e9559a9c0a4 /drivers/infiniband/hw/nes/nes_cm.c
parentvlan: remove usage of dev->master in __vlan_find_dev_deep() (diff)
downloadlinux-dev-7f6e7101dfcc228151779354f6cdc5e1d62f576b.tar.xz
linux-dev-7f6e7101dfcc228151779354f6cdc5e1d62f576b.zip
nes: remove usage of dev->master
Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/infiniband/hw/nes/nes_cm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 22ea67eea5dc..24b9f1a0107b 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1340,7 +1340,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
}
if (netif_is_bond_slave(nesvnic->netdev))
- netdev = nesvnic->netdev->master;
+ netdev = netdev_master_upper_dev_get(nesvnic->netdev);
else
netdev = nesvnic->netdev;