Re: [PATCH net-next-2.6 2/6] be2net: fix to not drop unfiltered vlan pkts

[Jesse Gross <jesse@nicira.com>]

On Fri, Mar 18, 2011 at 6:20 AM, Sathya Perla <sathya.perla@emulex.com> wrote:
> When the device is in promiscuous mode, the driver can receive vlan packets
> (tag is always stripped by card) even when there is no vlan configuration.
> Such packets must be sent to the stack and not dropped.
>
> Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
> ---
>  drivers/net/benet/be_main.c |    9 ++-------
>  1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
> index 97c5167..18c6da4 100644
> --- a/drivers/net/benet/be_main.c
> +++ b/drivers/net/benet/be_main.c
> @@ -1013,15 +1013,10 @@ static void be_rx_compl_process(struct be_adapter *adapter,
>        skb->truesize = skb->len + sizeof(struct sk_buff);
>        skb->protocol = eth_type_trans(skb, adapter->netdev);
>
> -       if (unlikely(rxcp->vlanf)) {
> -               if (!adapter->vlan_grp || adapter->vlans_added == 0) {
> -                       kfree_skb(skb);
> -                       return;
> -               }
> +       if (unlikely(rxcp->vlanf))
>                vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid);

It would be better to use __vlan_hwaccel_put_tag() here - it's
equivalent but at least moves in the right direction.  Under the old
vlan model (which vlan_hwaccel_receive_skb() is left over from)
passing in a NULL vlan group is illegal, so it's inconsistent anyways.

Of course even better would be to fully convert over to the new vlan
model.  A quick skim through the code shows that there might be
similar issue with vlan_gro_frags() as above, so it could help catch
some of that.