r3836 - in trunk/kernel/source/linux-2.6/debian: . arch/sparc

[Jurij Smakov]

Author: jurij-guest
Date: 2005-08-11 02:39:12 +0000 (Thu, 11 Aug 2005)
New Revision: 3836

Modified:
   trunk/kernel/source/linux-2.6/debian/arch/sparc/config
   trunk/kernel/source/linux-2.6/debian/changelog
Log:
Enable CONFIG_IP_ADVANCED_ROUTER and friends
on sparc64 to take care of #321236.


Modified: trunk/kernel/source/linux-2.6/debian/arch/sparc/config
===================================================================
--- trunk/kernel/source/linux-2.6/debian/arch/sparc/config	2005-08-11 01:20:07 UTC (rev 3835)
+++ trunk/kernel/source/linux-2.6/debian/arch/sparc/config	2005-08-11 02:39:12 UTC (rev 3836)
@@ -110,7 +110,6 @@
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
 # CONFIG_IP_PNP_DHCP is not set
 # CONFIG_IP_PNP_BOOTP is not set
@@ -530,3 +529,8 @@
 # CONFIG_CRYPTO_TEST is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC32=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ADVANCED_ROUTER=y

Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog	2005-08-11 01:20:07 UTC (rev 3835)
+++ trunk/kernel/source/linux-2.6/debian/changelog	2005-08-11 02:39:12 UTC (rev 3836)
@@ -16,6 +16,10 @@
 
   * Fix permissions in source tarball. (Bastian Blank) (Closes: #322409)
 
+  * Enable the CONFIG_IP_ADVANCED_ROUTER and related options on
+    sparc64 to sync with other architectures. (Jurij Smakov)
+    Closes: #321236
+
  -- Bastian Blank <waldi at debian.org>  Wed, 10 Aug 2005 20:21:30 +0200
 
 linux-2.6 (2.6.12-2) unstable; urgency=low