From 11f06a1b8c9b490aafc900ed9f2f9c492cadc7a5 Mon Sep 17 00:00:00 2001
From: Dimitris Michailidis <dm@chelsio.com>
Date: Mon, 2 Aug 2010 13:19:17 +0000
Subject: [PATCH] --- yaml --- r: 204013 b: refs/heads/master c:
 ba5d3c66e02c3dac66a386b6af0dc9687a4dba67 h: refs/heads/master i:   204011:
 ff760405824d0bafa8ff72a9f57a45ac267fc1ab v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/cxgb4/sge.c    | 7 ++++---
 trunk/drivers/net/cxgb4/t4_msg.h | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 92f07747467d..874cbfd6741a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63bcceec6e3ba8ffe0e2a0bec75afcdf6403165c
+refs/heads/master: ba5d3c66e02c3dac66a386b6af0dc9687a4dba67
diff --git a/trunk/drivers/net/cxgb4/sge.c b/trunk/drivers/net/cxgb4/sge.c
index 4388f72d586a..304302a71dbc 100644
--- a/trunk/drivers/net/cxgb4/sge.c
+++ b/trunk/drivers/net/cxgb4/sge.c
@@ -1593,14 +1593,15 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,
 
 	if (csum_ok && (pi->rx_offload & RX_CSO) &&
 	    (pkt->l2info & htonl(RXF_UDP | RXF_TCP))) {
-		if (!pkt->ip_frag)
+		if (!pkt->ip_frag) {
 			skb->ip_summed = CHECKSUM_UNNECESSARY;
-		else {
+			rxq->stats.rx_cso++;
+		} else if (pkt->l2info & htonl(RXF_IP)) {
 			__sum16 c = (__force __sum16)pkt->csum;
 			skb->csum = csum_unfold(c);
 			skb->ip_summed = CHECKSUM_COMPLETE;
+			rxq->stats.rx_cso++;
 		}
-		rxq->stats.rx_cso++;
 	} else
 		skb->ip_summed = CHECKSUM_NONE;
 
diff --git a/trunk/drivers/net/cxgb4/t4_msg.h b/trunk/drivers/net/cxgb4/t4_msg.h
index 623932b39b5d..a550d0c706f3 100644
--- a/trunk/drivers/net/cxgb4/t4_msg.h
+++ b/trunk/drivers/net/cxgb4/t4_msg.h
@@ -529,6 +529,8 @@ struct cpl_rx_pkt {
 	__be32 l2info;
 #define RXF_UDP (1 << 22)
 #define RXF_TCP (1 << 23)
+#define RXF_IP  (1 << 24)
+#define RXF_IP6 (1 << 25)
 	__be16 hdr_len;
 	__be16 err_vec;
 };