From be8f56301da90f7f2ff5d30292b9f070c597f198 Mon Sep 17 00:00:00 2001 From: Vasanthy Kolluri Date: Thu, 9 Jun 2011 10:36:52 +0000 Subject: [PATCH] --- yaml --- r: 255484 b: refs/heads/master c: 8757446d8df4446fc7f5d24ad6d53e9f265cc021 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/enic_main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 843a41e3c341..0f30b0e1889c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6018e1183ba52735d47e8c183497d8598da75351 +refs/heads/master: 8757446d8df4446fc7f5d24ad6d53e9f265cc021 diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index c7797ecd90d9..ea4aededbfe1 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/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],