From 0d4d72c8d5daaf93eda45252f36e246e3477dfb8 Mon Sep 17 00:00:00 2001
From: Scott Feldman <scofeldm@cisco.com>
Date: Wed, 24 Sep 2008 11:23:22 -0700
Subject: [PATCH] --- yaml --- r: 111911 b: refs/heads/master c:
 d9c3c57ffc23b562a6ef8da794fc9702e1c3b328 h: refs/heads/master i:   111909:
 bd50a1adda9f943b42e5834f052c245100c88629   111907:
 13aa3f9d7a118d85dd3d0ee7a5820604e2df342c   111903:
 74fd970b2d72acc2f8fb626fca61698332a4524f v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/enic/enic_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 88a03558b1ae..dbcb60af0d31 100644
--- 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
index 4cf5ec76c993..e6d5f116ad77 100644
--- 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);