---

yaml --- r: 111911 b: refs/heads/master c: d9c3c57 h: refs/heads/master i: 111909: bd50a1a 111907: 13aa3f9 111903: 74fd970 v: v3
git-mirror · Sep 25, 2008 · 0d4d72c · 0d4d72c
1 parent 6fbf73e
commit 0d4d72c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b060be0582373be3c380629d7a6de5f06a311ed
+refs/heads/master: d9c3c57ffc23b562a6ef8da794fc9702e1c3b328
diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c
@@ -941,7 +941,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 
 		if (enic->vlan_group && vlan_stripped) {
 
-			if (ENIC_SETTING(enic, LRO))
+			if (ENIC_SETTING(enic, LRO) && ipv4)
 				lro_vlan_hwaccel_receive_skb(&enic->lro_mgr,
 					skb, enic->vlan_group,
 					vlan, cq_desc);
@@ -951,7 +951,7 @@ static void enic_rq_indicate_buf(struct vnic_rq *rq,
 
 		} else {
 
-			if (ENIC_SETTING(enic, LRO))
+			if (ENIC_SETTING(enic, LRO) && ipv4)
 				lro_receive_skb(&enic->lro_mgr, skb, cq_desc);
 			else
 				netif_receive_skb(skb);