---

yaml --- r: 255484 b: refs/heads/master c: 8757446 h: refs/heads/master v: v3
git-mirror · Jun 9, 2011 · be8f563 · be8f563
1 parent cc85e03
commit be8f563
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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],