aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2011-07-17 04:53:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-17 15:33:22 -0400
commit69ecca86da4890c13a5e29c51b4ac76a1a8a62c9 (patch)
tree3a0084284ef48af692f7471a5736b0099912a77a /drivers/net/qlcnic
parent178edcbc6b539dfc21062fed9bf31701a8952e1c (diff)
net: vlan, qlcnic: make vlan_find_dev private
there is only one user of vlan_find_dev outside of the actual vlan code: qlcnic uses it to iterate over some VLANs it knows. let's just make vlan_find_dev private to the VLAN code and have the iteration in qlcnic be a bit more direct. (a few rcu dereferences less too) Signed-off-by: David Lamparter <equinox@diac24.net> Cc: Patrick McHardy <kaber@trash.net> Cc: Amit Kumar Salecha <amit.salecha@qlogic.com> Cc: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Cc: linux-driver@qlogic.com Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 006a693d49a7..3579229db4a9 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -4198,13 +4198,18 @@ static void
4198qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event) 4198qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
4199{ 4199{
4200 struct qlcnic_adapter *adapter = netdev_priv(netdev); 4200 struct qlcnic_adapter *adapter = netdev_priv(netdev);
4201 struct vlan_group *grp;
4201 struct net_device *dev; 4202 struct net_device *dev;
4202 u16 vid; 4203 u16 vid;
4203 4204
4204 qlcnic_config_indev_addr(adapter, netdev, event); 4205 qlcnic_config_indev_addr(adapter, netdev, event);
4205 4206
4207 grp = rcu_dereference_rtnl(netdev->vlgrp);
4208 if (!grp)
4209 return;
4210
4206 for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) { 4211 for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
4207 dev = vlan_find_dev(netdev, vid); 4212 dev = vlan_group_get_device(grp, vid);
4208 if (!dev) 4213 if (!dev)
4209 continue; 4214 continue;
4210 qlcnic_config_indev_addr(adapter, dev, event); 4215 qlcnic_config_indev_addr(adapter, dev, event);