diff options
| author |   Vasanthy Kolluri <vkolluri@cisco.com> | 2011-06-09 10:36:52 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-06-09 14:58:09 -0700 |
| commit | 8757446d8df4446fc7f5d24ad6d53e9f265cc021 (patch) | |
| tree | 622d76c722b84bec203089f85d8d0b429d72b7fa /drivers/net/enic/enic_main.c | |
| parent | Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge (diff) | |
| download | linux-dev-8757446d8df4446fc7f5d24ad6d53e9f265cc021.tar.xz linux-dev-8757446d8df4446fc7f5d24ad6d53e9f265cc021.zip | |
enic: Pass 802.1p bits for packets tagged with vlan zero
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: ad1afb00393915a51c21b1ae8704562bf036855f
- Available 2.6.36 and later
2) vlan: Centralize handling of hardware acceleration.
- net-next-2.6 git commit: 3701e51382a026cba10c60b03efabe534fba4ca4
- 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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/enic/enic_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index c7797ecd90d9..ea4aededbfe1 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -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], |