aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 00:54:44 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-21 16:47:57 -0400
commit223bb15e4a78115bb1bbc3e58e246d26f2c16462 (patch)
treeae6e0f68df0f8b0dcff6c9e5eb2891af351f5346
parent5526c0313777d4e5a6551de6b34705ac1fce92a7 (diff)
qlcnic: remove usage of vlan_group_get_device
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 3579229db4a9..5ca1b562443c 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -4198,18 +4198,13 @@ 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;
4202 struct net_device *dev; 4201 struct net_device *dev;
4203 u16 vid; 4202 u16 vid;
4204 4203
4205 qlcnic_config_indev_addr(adapter, netdev, event); 4204 qlcnic_config_indev_addr(adapter, netdev, event);
4206 4205
4207 grp = rcu_dereference_rtnl(netdev->vlgrp);
4208 if (!grp)
4209 return;
4210
4211 for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) { 4206 for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
4212 dev = vlan_group_get_device(grp, vid); 4207 dev = __vlan_find_dev_deep(netdev, vid);
4213 if (!dev) 4208 if (!dev)
4214 continue; 4209 continue;
4215 qlcnic_config_indev_addr(adapter, dev, event); 4210 qlcnic_config_indev_addr(adapter, dev, event);