From 149032ad3afc4684121dc6538556c160a627552d Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Thu, 7 Feb 2013 03:13:13 +0000
Subject: [PATCH] --- yaml --- r: 349739 b: refs/heads/master c:
 bd69ba798e21a39748d95942f6191a4f7c9611fc h: refs/heads/master i:   349737:
 3ed52022663e09f42f0713f4f24089fe0416936b   349735:
 1f7befb35b4a9082149b7a0df450ff81a5672944 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4dfed5a1477e..a0af863e906b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1594712f9e5426bfb96b96404cf3726a7b348db7
+refs/heads/master: bd69ba798e21a39748d95942f6191a4f7c9611fc
diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index 6f82812d0fab..09aa310b6194 100644
--- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -986,8 +986,13 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
 	th->seq = htonl(seq_number);
 	length = skb->len;
 
-	if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP)
+	if (adapter->flags & QLCNIC_FW_LRO_MSS_CAP) {
 		skb_shinfo(skb)->gso_size = qlcnic_get_lro_sts_mss(sts_data1);
+		if (skb->protocol == htons(ETH_P_IPV6))
+			skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+		else
+			skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+	}
 
 	if (vid != 0xffff)
 		__vlan_hwaccel_put_tag(skb, vid);