diff --git a/[refs] b/[refs] index 6c48150d6358..739d6f883d6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5526c0313777d4e5a6551de6b34705ac1fce92a7 +refs/heads/master: 223bb15e4a78115bb1bbc3e58e246d26f2c16462 diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index 3579229db4a9..5ca1b562443c 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/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);