diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-24 14:41:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-24 14:41:56 -0500 |
commit | 22f4fbd9bd283ef85126e511171932a4af703776 (patch) | |
tree | fe0387429b1dceed477a05e9ecc4b27885bad929 /drivers/infiniband/hw | |
parent | bba14de98753cb6599a2dae0e520714b2153522d (diff) |
infiniband: remove dev_base_lock use
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)
Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index bf3e20cd0298..4e55a28fb6d4 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
@@ -848,8 +848,8 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear) | |||
848 | goto out; | 848 | goto out; |
849 | } | 849 | } |
850 | 850 | ||
851 | read_lock(&dev_base_lock); | 851 | rcu_read_lock(); |
852 | for_each_netdev(&init_net, tmp) { | 852 | for_each_netdev_rcu(&init_net, tmp) { |
853 | if (ndev && (tmp == ndev || rdma_vlan_dev_real_dev(tmp) == ndev)) { | 853 | if (ndev && (tmp == ndev || rdma_vlan_dev_real_dev(tmp) == ndev)) { |
854 | gid.global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL); | 854 | gid.global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL); |
855 | vid = rdma_vlan_dev_vlan_id(tmp); | 855 | vid = rdma_vlan_dev_vlan_id(tmp); |
@@ -884,7 +884,7 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear) | |||
884 | } | 884 | } |
885 | } | 885 | } |
886 | } | 886 | } |
887 | read_unlock(&dev_base_lock); | 887 | rcu_read_unlock(); |
888 | 888 | ||
889 | for (i = 0; i < 128; ++i) | 889 | for (i = 0; i < 128; ++i) |
890 | if (!hits[i]) { | 890 | if (!hits[i]) { |