diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:06:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-26 00:06:37 -0400 |
| commit | dc50eddb2f3a0dff365f093b2a93fb4ab4dd4389 (patch) | |
| tree | 314a2ec5770b18c20a11066889342a48f46ecea0 /drivers/infiniband | |
| parent | 9f34217c846a96dea03f4418e2f27423658d3542 (diff) | |
| parent | cf55bb2439d2a7080fae6edf84919fd81f891574 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/nes: Fix test of uninitialized netdev
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 | |||
| 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; |