aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-03-24 20:13:20 -0400
committerRoland Dreier <roland@purestorage.com>2011-03-24 20:18:30 -0400
commitcf55bb2439d2a7080fae6edf84919fd81f891574 (patch)
tree1f9c3f01fb4cf2a6192e4dfa714ce001f7c9b2f1 /drivers/infiniband
parent6c5103890057b1bb781b26b7aae38d33e4c517d8 (diff)
RDMA/nes: Fix test of uninitialized netdev
Commit 1765a575334f ("net: make dev->master general") introduced a test of an uninitialized netdev. Fix the code so the intended netdev is tested. Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
-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 ef3291551bc6..cfa3a2b22232 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1116,7 +1116,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
1116 return rc; 1116 return rc;
1117 } 1117 }
1118 1118
1119 if (netif_is_bond_slave(netdev)) 1119 if (netif_is_bond_slave(nesvnic->netdev))
1120 netdev = nesvnic->netdev->master; 1120 netdev = nesvnic->netdev->master;
1121 else 1121 else
1122 netdev = nesvnic->netdev; 1122 netdev = nesvnic->netdev;