[kernel] r19778 - in dists/sid/linux/debian/patches: . debian

[Ben Hutchings]

Author: benh
Date: Sun Jan 27 01:32:39 2013
New Revision: 19778

Log:
Undo an ABI change in 3.2.37

Added:
   dists/sid/linux/debian/patches/debian/net-avoid-ABI-break-in-3.2.37.patch
Modified:
   dists/sid/linux/debian/patches/series

Added: dists/sid/linux/debian/patches/debian/net-avoid-ABI-break-in-3.2.37.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/debian/net-avoid-ABI-break-in-3.2.37.patch	Sun Jan 27 01:32:39 2013	(r19778)
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: net: Avoid ABI break in 3.2.37
+Date: Sun, 27 Jan 2013 01:29:15 +0000
+
+A huge number of source files indirectly include <linux/snmp.h> even
+though nothing outside the TCP stack should make any use for the
+numbers defined there.  To avoid symbol version changes, restore the
+deleted enumerator and hide the added enumerators from genksyms.
+
+---
+--- a/include/linux/snmp.h
++++ b/include/linux/snmp.h
+@@ -210,6 +210,7 @@ enum
+ 	LINUX_MIB_TCPDSACKRECV,			/* TCPDSACKRecv */
+ 	LINUX_MIB_TCPDSACKOFORECV,		/* TCPDSACKOfoRecv */
+ 	LINUX_MIB_TCPABORTONDATA,		/* TCPAbortOnData */
++	LINUX_MIB_TCPABORTONSYN,		/* unused, binary compat */
+ 	LINUX_MIB_TCPABORTONCLOSE,		/* TCPAbortOnClose */
+ 	LINUX_MIB_TCPABORTONMEMORY,		/* TCPAbortOnMemory */
+ 	LINUX_MIB_TCPABORTONTIMEOUT,		/* TCPAbortOnTimeout */
+@@ -232,8 +233,10 @@ enum
+ 	LINUX_MIB_TCPTIMEWAITOVERFLOW,		/* TCPTimeWaitOverflow */
+ 	LINUX_MIB_TCPREQQFULLDOCOOKIES,		/* TCPReqQFullDoCookies */
+ 	LINUX_MIB_TCPREQQFULLDROP,		/* TCPReqQFullDrop */
++#ifndef __GENKSYMS__
+ 	LINUX_MIB_TCPCHALLENGEACK,		/* TCPChallengeACK */
+ 	LINUX_MIB_TCPSYNCHALLENGE,		/* TCPSYNChallenge */
++#endif
+ 	__LINUX_MIB_MAX
+ };
+ 

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Sun Jan 27 00:41:05 2013	(r19777)
+++ dists/sid/linux/debian/patches/series	Sun Jan 27 01:32:39 2013	(r19778)
@@ -472,3 +472,4 @@
 bugfix/all/ext4-fix-hole-punch-failure-when-depth-is-greater-th.patch
 bugfix/all/ext4-fix-kernel-BUG-on-large-scale-rm-rf-commands.patch
 bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch
+debian/net-avoid-ABI-break-in-3.2.37.patch