aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-05-02 15:59:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-05-02 15:59:57 +0000
commit30c43603456d8d68fbdfc535c6671607669ec3d7 (patch)
treed31de71d23a57bd15481d068aa7af81d0a141598 /target/linux/generic/patches-3.6
parent24636fcabf64031a93a930ea1cd26f086acd30f8 (diff)
downloadupstream-30c43603456d8d68fbdfc535c6671607669ec3d7.tar.gz
upstream-30c43603456d8d68fbdfc535c6671607669ec3d7.tar.bz2
upstream-30c43603456d8d68fbdfc535c6671607669ec3d7.zip
kernel: do not strip /proc/net/ip_mr_* in the /proc debloat patch, it is used by iproute2
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36529
Diffstat (limited to 'target/linux/generic/patches-3.6')
-rw-r--r--target/linux/generic/patches-3.6/902-debloat_proc.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.6/902-debloat_proc.patch b/target/linux/generic/patches-3.6/902-debloat_proc.patch
index f3fd777277..6bbe9d63d2 100644
--- a/target/linux/generic/patches-3.6/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.6/902-debloat_proc.patch
@@ -266,19 +266,6 @@
return register_pernet_subsys(&igmp_net_ops);
}
#endif
---- a/net/ipv4/ipmr.c
-+++ b/net/ipv4/ipmr.c
-@@ -70,6 +70,10 @@
- #define CONFIG_IP_PIMSM 1
- #endif
-
-+#ifdef CONFIG_PROC_STRIPPED
-+#undef CONFIG_PROC_FS
-+#endif
-+
- struct mr_table {
- struct list_head list;
- #ifdef CONFIG_NET_NS
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -498,6 +498,9 @@ static __net_initdata struct pernet_oper