Skip to content

Commit

Permalink
enic: Pass 802.1p bits for packets tagged with vlan zero
Browse files Browse the repository at this point in the history
enic driver currently passes 802.1p bits to the upper layers for packets
tagged with non-zero vlan ids only. This patch extends such behaviour to
zero vlan tagged packets also.

The patch is dependant on the following kernel patches:

1) vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
   - net-next-2.6 git commit: ad1afb0
   - Available 2.6.36 and later
2) vlan: Centralize handling of hardware acceleration.
  - net-next-2.6 git commit: 3701e51
  - Available 2.6.37 and later

Signed-off-by: Christian Benvenuti <benve@cisco.com>
Signed-off-by: Danny Guo <dannguo@cisco.com>
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vasanthy Kolluri authored and David S. Miller committed Jun 9, 2011
1 parent 6018e11 commit 8757446
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1266,8 +1266,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,

skb->dev = netdev;

if (enic->vlan_group && vlan_stripped &&
(vlan_tci & CQ_ENET_RQ_DESC_VLAN_TCI_VLAN_MASK)) {
if (vlan_stripped) {

if (netdev->features & NETIF_F_GRO)
vlan_gro_receive(&enic->napi[q_number],
Expand Down

0 comments on commit 8757446

Please sign in to comment.