[kernel] r15826 - in dists/sid/linux-2.6/debian: . config patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Jun  5 18:09:30 2010
New Revision: 15826

Log:
Build inet_lro as a module

Added:
   dists/sid/linux-2.6/debian/patches/features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config
   dists/sid/linux-2.6/debian/patches/series/16

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Jun  5 08:04:31 2010	(r15825)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jun  5 18:09:30 2010	(r15826)
@@ -8,6 +8,7 @@
   * Add stable 2.6.32.15
   * Add mantis DVB driver and mb86a16 and tda665x DVB front-ends,
     backported by Bjørn Mork (Closes: #577264)
+  * Build inet_lro as a module
 
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Sat Jun  5 08:04:31 2010	(r15825)
+++ dists/sid/linux-2.6/debian/config/config	Sat Jun  5 18:09:30 2010	(r15826)
@@ -3519,7 +3519,7 @@
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
+CONFIG_INET_LRO=m
 CONFIG_INET_DIAG=m
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m

Added: dists/sid/linux-2.6/debian/patches/features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch	Sat Jun  5 18:09:30 2010	(r15826)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 5 Jun 2010 00:42:57 +0100
+Subject: [PATCH] Revert "ipv4: Make INET_LRO a bool instead of tristate."
+
+This reverts commit e81963b180ac502fda0326edf059b1e29cdef1a2.
+
+This code is now deprecated in favour of GRO, and only a few drivers
+use it.  For Debian kernels (and probably other distribution kernels)
+it should be built as a module.
+
+The original change to prevent building it as a module was made in an
+attempt to avoid the case where some dependents are set to y and some
+to m, and INET_LRO can be set to m rather than y.  However, the
+Kconfig system will now reliably set INET_LRO=y in this case.
+---
+ net/ipv4/Kconfig |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
+index 70491d9..483d427 100644
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -398,7 +398,7 @@ config INET_XFRM_MODE_BEET
+ 	  If unsure, say Y.
+ 
+ config INET_LRO
+-	bool "Large Receive Offload (ipv4/tcp)"
++	tristate "Large Receive Offload (ipv4/tcp)"
+ 	default y
+ 	---help---
+ 	  Support for Large Receive Offload (ipv4/tcp).
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16	Sat Jun  5 08:04:31 2010	(r15825)
+++ dists/sid/linux-2.6/debian/patches/series/16	Sat Jun  5 18:09:30 2010	(r15826)
@@ -123,3 +123,4 @@
 + features/all/mantis/0119-Mantis-hopper-use-MODULE_DEVICE_TABLE-use-the-macro-.patch
 + features/all/mantis/0120-V4L-DVB-13808-Mantis-Hopper-Build-update-for-Mantis-.patch
 + features/all/mantis/0121-V4L-DVB-mantis-Select-correct-frontends.patch
++ features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch