commit 7f6e7101dfcc228151779354f6cdc5e1d62f576b
author Jiri Pirko <jiri@resnulli.us> Thu Jan 03 22:49:00 2013 +0000
committer David S. Miller <davem@davemloft.net> Fri Jan 04 13:31:50 2013 -0800
tree 483d50edbd4903d019e5f8d589519e9559a9c0a4
parent 1cdfd72f791918ab4690570d7d93a1f86e171cb8

nes: remove usage of dev->master

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

drivers/infiniband/hw/nes/nes_cm.c

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 22ea67e..24b9f1a 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1340,7 +1340,7 @@
 	}
 
 	if (netif_is_bond_slave(nesvnic->netdev))
-		netdev = nesvnic->netdev->master;
+		netdev = netdev_master_upper_dev_get(nesvnic->netdev);
 	else
 		netdev = nesvnic->netdev;