aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/sw/rxe/rxe_net.c
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2017-02-19 09:18:21 -0500
committerDoug Ledford <dledford@redhat.com>2017-02-19 09:18:21 -0500
commit6dd7abae7110da6fa01f048baf5b679b5a4a56dd (patch)
tree17ca298bbae17f05bdadae7f88e3be0f113a713f /drivers/infiniband/sw/rxe/rxe_net.c
parentIB/cma: Destination and source addr families must match (diff)
parentRDMA: Don't reference kernel private header from UAPI header (diff)
downloadlinux-dev-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.tar.xz
linux-dev-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.zip
Merge branch 'k.o/for-4.10-rc' into HEAD
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_net.c')
-rw-r--r--drivers/infiniband/sw/rxe/rxe_net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 50144c307eb4..ef68ec261445 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -538,7 +538,7 @@ struct rxe_dev *rxe_net_add(struct net_device *ndev)
}
spin_lock_bh(&dev_list_lock);
- list_add_tail(&rxe_dev_list, &rxe->list);
+ list_add_tail(&rxe->list, &rxe_dev_list);
spin_unlock_bh(&dev_list_lock);
return rxe;
}