Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / drivers / net / qlcnic / qlcnic_main.c

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 3579229..5ca1b56 100644 (file)
--- 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);