Переглянути джерело

be2net: Fix vlans_added counter

When a VLAN is added by user, adapter->vlans_added is incremented.
But if the VLAN is already programmed in HW, driver ends up
incrementing the counter wrongly.

Increment the counter only if VLAN is not already programmed in the HW.

Signed-off-by: Vasundhara Volam <vasundhara.volam@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Vasundhara Volam 11 роки тому
батько
коміт
48291c22b7
1 змінених файлів з 5 додано та 2 видалено
  1. 5 2
      drivers/net/ethernet/emulex/benet/be_main.c

+ 5 - 2
drivers/net/ethernet/emulex/benet/be_main.c

@@ -1138,7 +1138,10 @@ static int be_vlan_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 
 
 	/* Packets with VID 0 are always received by Lancer by default */
 	/* Packets with VID 0 are always received by Lancer by default */
 	if (lancer_chip(adapter) && vid == 0)
 	if (lancer_chip(adapter) && vid == 0)
-		goto ret;
+		return status;
+
+	if (adapter->vlan_tag[vid])
+		return status;
 
 
 	adapter->vlan_tag[vid] = 1;
 	adapter->vlan_tag[vid] = 1;
 	adapter->vlans_added++;
 	adapter->vlans_added++;
@@ -1148,7 +1151,7 @@ static int be_vlan_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
 		adapter->vlans_added--;
 		adapter->vlans_added--;
 		adapter->vlan_tag[vid] = 0;
 		adapter->vlan_tag[vid] = 0;
 	}
 	}
-ret:
+
 	return status;
 	return status;
 }
 }