aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-09-18 09:05:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-09-18 09:05:01 +0000
commit708c58c1a7747c251c6d489a6e9870d4d4070f2e (patch)
tree0e9167134309feef27b21bd3103d2990e8b62e38
parent6c018c2f5e60c6354ce31768373f87422549880d (diff)
downloadupstream-708c58c1a7747c251c6d489a6e9870d4d4070f2e.tar.gz
upstream-708c58c1a7747c251c6d489a6e9870d4d4070f2e.tar.bz2
upstream-708c58c1a7747c251c6d489a6e9870d4d4070f2e.zip
kernel: fix dependencies of the sock_diag debloat patch (#20544)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46997
-rw-r--r--target/linux/generic/patches-3.18/901-debloat_sock_diag.patch20
-rw-r--r--target/linux/generic/patches-4.1/901-debloat_sock_diag.patch20
2 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch b/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
index d172d1b8c2..99f23a027e 100644
--- a/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-3.18/901-debloat_sock_diag.patch
@@ -43,3 +43,23 @@
default n
---help---
Support for UNIX socket monitoring interface used by the ss tool.
+--- a/net/netlink/Kconfig
++++ b/net/netlink/Kconfig
+@@ -13,6 +13,7 @@ config NETLINK_MMAP
+
+ config NETLINK_DIAG
+ tristate "NETLINK: socket monitoring interface"
++ select SOCK_DIAG
+ default n
+ ---help---
+ Support for NETLINK socket monitoring interface used by the ss tool.
+--- a/net/packet/Kconfig
++++ b/net/packet/Kconfig
+@@ -18,6 +18,7 @@ config PACKET
+ config PACKET_DIAG
+ tristate "Packet: sockets monitoring interface"
+ depends on PACKET
++ select SOCK_DIAG
+ default n
+ ---help---
+ Support for PF_PACKET sockets monitoring interface used by the ss tool.
diff --git a/target/linux/generic/patches-4.1/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.1/901-debloat_sock_diag.patch
index 9208d6bfc9..071616942f 100644
--- a/target/linux/generic/patches-4.1/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-4.1/901-debloat_sock_diag.patch
@@ -43,3 +43,23 @@
default n
---help---
Support for UNIX socket monitoring interface used by the ss tool.
+--- a/net/netlink/Kconfig
++++ b/net/netlink/Kconfig
+@@ -13,6 +13,7 @@ config NETLINK_MMAP
+
+ config NETLINK_DIAG
+ tristate "NETLINK: socket monitoring interface"
++ select SOCK_DIAG
+ default n
+ ---help---
+ Support for NETLINK socket monitoring interface used by the ss tool.
+--- a/net/packet/Kconfig
++++ b/net/packet/Kconfig
+@@ -18,6 +18,7 @@ config PACKET
+ config PACKET_DIAG
+ tristate "Packet: sockets monitoring interface"
+ depends on PACKET
++ select SOCK_DIAG
+ default n
+ ---help---
+ Support for PF_PACKET sockets monitoring interface used by the ss tool.