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>

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>
Jiri Pirko · David S. Miller
1 parent 5526c03137
Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff
drivers/net/qlcnic/qlcnic_main.c
@@ -4198,18 +4198,13 @@
 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);
...	...	@@ -4198,18 +4198,13 @@
4198	4198	qlcnic_restore_indev_addr(struct net_device *netdev, unsigned long event)
4199	4199	{
4200	4200	struct qlcnic_adapter *adapter = netdev_priv(netdev);
4201		- struct vlan_group *grp;
4202	4201	struct net_device *dev;
4203	4202	u16 vid;
4204	4203
4205	4204	qlcnic_config_indev_addr(adapter, netdev, event);
4206	4205
4207		- grp = rcu_dereference_rtnl(netdev->vlgrp);
4208		- if (!grp)
4209		- return;
4210		-
4211	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	4208	if (!dev)
4214	4209	continue;
4215	4210	qlcnic_config_indev_addr(adapter, dev, event);