From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH net-next 4/4] be2net: re-enable vlan filtering mode asap Date: Fri, 27 Jun 2014 17:14:40 +0400 Message-ID: <53AD6E40.2050407@cogentembedded.com> References: <1403869401-6545-1-git-send-email-sathya.perla@emulex.com> <1403869401-6545-5-git-send-email-sathya.perla@emulex.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit To: Sathya Perla , netdev@vger.kernel.org Return-path: Received: from mail-lb0-f170.google.com ([209.85.217.170]:48309 "EHLO mail-lb0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850AbaF0NO3 (ORCPT ); Fri, 27 Jun 2014 09:14:29 -0400 Received: by mail-lb0-f170.google.com with SMTP id 10so4059228lbg.29 for ; Fri, 27 Jun 2014 06:14:28 -0700 (PDT) In-Reply-To: <1403869401-6545-5-git-send-email-sathya.perla@emulex.com> Sender: netdev-owner@vger.kernel.org List-ID: Hello. On 06/27/2014 03:43 PM, Sathya Perla wrote: > From: Kalesh AP > While adding vlans, when the HW limit of vlan filters is reached, the > driver enables vlan promiscuous mode. > Similarily, while removing vlans, the driver must re-enable HW filtering > as soon as the number of vlan filters is within the HW limit. > Signed-off-by: Kalesh AP > Signed-off-by: Sathya Perla > --- > drivers/net/ethernet/emulex/benet/be_main.c | 9 +++------ > 1 files changed, 3 insertions(+), 6 deletions(-) > diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c > index 5ac9d13..3cf490b 100644 > --- a/drivers/net/ethernet/emulex/benet/be_main.c > +++ b/drivers/net/ethernet/emulex/benet/be_main.c > @@ -1176,15 +1176,12 @@ static int be_vlan_rem_vid(struct net_device *netdev, __be16 proto, u16 vid) > > /* Packets with VID 0 are always received by Lancer by default */ > if (lancer_chip(adapter) && vid == 0) > - goto ret; > + return status; > > clear_bit(vid, adapter->vids); > + adapter->vlans_added--; > + > status = be_vid_config(adapter); > - if (!status) > - adapter->vlans_added--; > - else > - set_bit(vid, adapter->vids); > -ret: > return status; You now can merge the above lines into: return be_vid_config(adapter); WBR, Sergei