[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTikBVhCkyX2JVmgd2FXHs_OnV=sy5P9dh3tL8odB@mail.gmail.com>
Date: Thu, 14 Oct 2010 18:36:21 -0700
From: Jesse Gross <jesse@...ira.com>
To: Michael Chan <mchan@...adcom.com>
Cc: "davem@...emloft.net" <davem@...emloft.net>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [RFC PATCH 3/7] bnx2: Update bnx2 to use new vlan accleration.
On Thu, Oct 14, 2010 at 3:56 PM, Michael Chan <mchan@...adcom.com> wrote:
>> if ((status & L2_FHDR_STATUS_L2_VLAN_TAG) &&
>> - !(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG)) {
>> - vtag = rx_hdr->l2_fhdr_vlan_tag;
>> -#ifdef BCM_VLAN
>> - if (bp->vlgrp)
>> - hw_vlan = 1;
>> - else
>> -#endif
>> - {
>> - struct vlan_ethhdr *ve = (struct vlan_ethhdr *)
>> - __skb_push(skb, 4);
>> -
>> - memmove(ve, skb->data + 4, ETH_ALEN * 2);
>> - ve->h_vlan_proto = htons(ETH_P_8021Q);
>> - ve->h_vlan_TCI = htons(vtag);
>> - len += 4;
>> - }
>> - }
>> + !(bp->rx_mode & BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG))
>
> This check for the rx_mode bit is no longer necessary if we always
> configure the chip to strip out the vlan tag.
Thanks, I've dropped it from my local tree. I may add support for
ethtool to disable vlan stripping in the future, so I might have to
add it back.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists