From 04f61a315e8470c8e7fb977f9ddcec4059f9dd16 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 1 Feb 2013 08:56:41 +0000
Subject: [PATCH] --- yaml --- r: 369282 b: refs/heads/master c:
 20967f42025f50e8497e6d71259ac5fb56655736 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/ethernet/freescale/fec_main.c     | 5 +++++
 trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
 trunk/include/uapi/linux/snmp.h                     | 1 -
 trunk/net/ipv4/proc.c                               | 1 -
 trunk/net/ipv4/tcp_output.c                         | 7 -------
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1f02366802e9..10b5faddc501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e280af026a5662ffd57c4e623b822df1f7f47ff
+refs/heads/master: 20967f42025f50e8497e6d71259ac5fb56655736
diff --git a/trunk/drivers/net/ethernet/freescale/fec_main.c b/trunk/drivers/net/ethernet/freescale/fec_main.c
index 20890874ead7..d4089925a5df 100644
--- a/trunk/drivers/net/ethernet/freescale/fec_main.c
+++ b/trunk/drivers/net/ethernet/freescale/fec_main.c
@@ -52,6 +52,11 @@
 
 #include <asm/cacheflush.h>
 
+#ifndef CONFIG_ARM
+#include <asm/coldfire.h>
+#include <asm/mcfsim.h>
+#endif
+
 #include "fec.h"
 
 #if defined(CONFIG_ARM)
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 1339932f59b1..d473a7c0c297 100644
--- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1337,7 +1337,7 @@ static unsigned int ixgbe_get_headlen(unsigned char *data,
 			return hdr.network - data;
 
 		/* record next protocol if header is present */
-		if (!hdr.ipv4->frag_off)
+		if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))
 			nexthdr = hdr.ipv4->protocol;
 	} else if (protocol == __constant_htons(ETH_P_IPV6)) {
 		if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))
diff --git a/trunk/include/uapi/linux/snmp.h b/trunk/include/uapi/linux/snmp.h
index fefdec91c68b..e00013a1debc 100644
--- a/trunk/include/uapi/linux/snmp.h
+++ b/trunk/include/uapi/linux/snmp.h
@@ -247,7 +247,6 @@ enum
 	LINUX_MIB_TCPFASTOPENPASSIVEFAIL,	/* TCPFastOpenPassiveFail */
 	LINUX_MIB_TCPFASTOPENLISTENOVERFLOW,	/* TCPFastOpenListenOverflow */
 	LINUX_MIB_TCPFASTOPENCOOKIEREQD,	/* TCPFastOpenCookieReqd */
-	LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
 	__LINUX_MIB_MAX
 };
 
diff --git a/trunk/net/ipv4/proc.c b/trunk/net/ipv4/proc.c
index 6da51d55d03a..b6f2ea174898 100644
--- a/trunk/net/ipv4/proc.c
+++ b/trunk/net/ipv4/proc.c
@@ -269,7 +269,6 @@ static const struct snmp_mib snmp4_net_list[] = {
 	SNMP_MIB_ITEM("TCPFastOpenPassiveFail", LINUX_MIB_TCPFASTOPENPASSIVEFAIL),
 	SNMP_MIB_ITEM("TCPFastOpenListenOverflow", LINUX_MIB_TCPFASTOPENLISTENOVERFLOW),
 	SNMP_MIB_ITEM("TCPFastOpenCookieReqd", LINUX_MIB_TCPFASTOPENCOOKIEREQD),
-	SNMP_MIB_ITEM("TCPSpuriousRtxHostQueues", LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES),
 	SNMP_MIB_SENTINEL
 };
 
diff --git a/trunk/net/ipv4/tcp_output.c b/trunk/net/ipv4/tcp_output.c
index 5f28131eb37e..d12694353540 100644
--- a/trunk/net/ipv4/tcp_output.c
+++ b/trunk/net/ipv4/tcp_output.c
@@ -846,13 +846,6 @@ static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it,
 		__net_timestamp(skb);
 
 	if (likely(clone_it)) {
-		const struct sk_buff *fclone = skb + 1;
-
-		if (unlikely(skb->fclone == SKB_FCLONE_ORIG &&
-			     fclone->fclone == SKB_FCLONE_CLONE))
-			NET_INC_STATS_BH(sock_net(sk),
-					 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES);
-
 		if (unlikely(skb_cloned(skb)))
 			skb = pskb_copy(skb, gfp_mask);
 		else