diff options
| author | Roland Dreier <roland@purestorage.com> | 2011-03-25 01:13:20 +0100 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-03-25 01:18:30 +0100 |
| commit | cf55bb2439d2a7080fae6edf84919fd81f891574 (patch) | |
| tree | 1f9c3f01fb4cf2a6192e4dfa714ce001f7c9b2f1 /drivers/infiniband | |
| parent | Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-cf55bb2439d2a7080fae6edf84919fd81f891574.tar.xz linux-cf55bb2439d2a7080fae6edf84919fd81f891574.zip | |
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.c | 2 |
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 return rc; } - if (netif_is_bond_slave(netdev)) + if (netif_is_bond_slave(nesvnic->netdev)) netdev = nesvnic->netdev->master; else netdev = nesvnic->netdev; |