From: Felix Fietkau Date: Thu, 2 May 2013 15:59:57 +0000 (+0000) Subject: kernel: do not strip /proc/net/ip_mr_* in the /proc debloat patch, it is used by... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=30c43603456d8d68fbdfc535c6671607669ec3d7;p=openwrt%2Fstaging%2Fdangole.git kernel: do not strip /proc/net/ip_mr_* in the /proc debloat patch, it is used by iproute2 Signed-off-by: Felix Fietkau SVN-Revision: 36529 --- 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 diff --git a/target/linux/generic/patches-3.7/902-debloat_proc.patch b/target/linux/generic/patches-3.7/902-debloat_proc.patch index 390a447d34..eb877a7bdf 100644 --- a/target/linux/generic/patches-3.7/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.7/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 @@ -502,6 +502,9 @@ static __net_initdata struct pernet_oper diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch index ba58ce3177..4479e44998 100644 --- a/target/linux/generic/patches-3.8/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch @@ -255,19 +255,6 @@ proc_net_remove(net, "route"); } ---- a/net/ipv4/ipmr.c -+++ b/net/ipv4/ipmr.c -@@ -71,6 +71,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 @@ -502,6 +502,9 @@ static __net_initdata struct pernet_oper diff --git a/target/linux/generic/patches-3.9/902-debloat_proc.patch b/target/linux/generic/patches-3.9/902-debloat_proc.patch index 318db6370d..de5b1c6fb8 100644 --- a/target/linux/generic/patches-3.9/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.9/902-debloat_proc.patch @@ -225,19 +225,6 @@ remove_proc_entry("route", net->proc_net); } ---- a/net/ipv4/ipmr.c -+++ b/net/ipv4/ipmr.c -@@ -71,6 +71,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 @@ -503,6 +503,9 @@ static __net_initdata struct pernet_oper