aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 04:54:44 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-21 13:47:57 -0700
commit223bb15e4a78115bb1bbc3e58e246d26f2c16462 (patch)
treeae6e0f68df0f8b0dcff6c9e5eb2891af351f5346 /drivers
parentstmmac: do vlan cleanup (diff)
downloadlinux-dev-223bb15e4a78115bb1bbc3e58e246d26f2c16462.tar.xz
linux-dev-223bb15e4a78115bb1bbc3e58e246d26f2c16462.zip
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>
Diffstat (limited to '')
-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
qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
{
struct qlcnic_adapter *adapter = netdev_priv(netdev);
- struct vlan_group *grp;
struct net_device *dev;
u16 vid;
qlcnic_config_indev_addr(adapter, netdev, event);
- grp = rcu_dereference_rtnl(netdev->vlgrp);
- if (!grp)
- return;
-
for_each_set_bit(vid, adapter->vlans, VLAN_N_VID) {
- dev = vlan_group_get_device(grp, vid);
+ dev = __vlan_find_dev_deep(netdev, vid);
if (!dev)
continue;
qlcnic_config_indev_addr(adapter, dev, event);