[kernel] r7735 - in dists/trunk/linux-2.6/debian: . arch arch/amd64 arch/hppa arch/mips arch/mipsel

[maximilian attems]

Author: maks-guest
Date: Fri Nov 10 08:59:04 2006
New Revision: 7735

Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/mips/config.qemu
   dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu
   dists/trunk/linux-2.6/debian/changelog
Log:
activate in top .config the net action classifier


Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Fri Nov 10 08:59:04 2006
@@ -383,14 +383,6 @@
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_NETPOLL_TRAP is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Fri Nov 10 08:59:04 2006
@@ -1038,6 +1038,13 @@
 CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_NET_CLS=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_CLS_RSVP=m
 CONFIG_CLS_U32_PERF=y
 CONFIG_NET_CLS_RSVP6=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Fri Nov 10 08:59:04 2006
@@ -269,13 +269,6 @@
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_PKTGEN is not set
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_RX is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.qemu
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.qemu	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.qemu	Fri Nov 10 08:59:04 2006
@@ -587,14 +587,6 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.qemu	Fri Nov 10 08:59:04 2006
@@ -587,14 +587,6 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Nov 10 08:59:04 2006
@@ -16,6 +16,8 @@
    - mm: small cleanup of install_page()
    - mm: fixup do_wp_page()
    - mm: msync() cleanup (closes: 394392)
+  * Enable the new ACT modules globaly. They were already set for amd64, hppa
+    and mips/mipsel - needed by newer iproute2. (closes: #395882)
 
   [ Steve Langasek ]
   * [alpha] new titan-video patch, for compatibility with TITAN and similar
@@ -27,7 +29,7 @@
   [ Martin Michlmayr ]
   - arm: Set CONFIG_BINFMT_MISC=m
 
- -- Steve Langasek <vorlon at debian.org>  Thu,  9 Nov 2006 01:09:09 -0800
+ -- maximilian attems <maks at sternwelten.at>  Fri, 10 Nov 2006 08:57:45 +0100
 
 linux-2.6 (2.6.18-5) unstable; urgency=low