From: Sriharsha Basavapatna Date: Wed, 3 Feb 2016 04:19:18 +0000 (+0530) Subject: be2net: Fix be_vlan_rem_vid() to check vlan id being removed X-Git-Tag: v4.14-rc1~3609^2~320^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41dcdfbd0944a3ef08224a8c9ba3b2fdeae0dd86;p=platform%2Fkernel%2Flinux-rpi.git be2net: Fix be_vlan_rem_vid() to check vlan id being removed The driver decrements its vlan count without checking if it is really present in its list. This results in an invalid vlan count and impacts subsequent vlan add/rem ops. The function be_vlan_rem_vid() should be updated to fix this. Signed-off-by: Sriharsha Basavapatna Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index f99de36..09e6f2c 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -1463,6 +1463,9 @@ static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid) if (lancer_chip(adapter) && vid == 0) return 0; + if (!test_bit(vid, adapter->vids)) + return 0; + clear_bit(vid, adapter->vids); adapter->vlans_added--;