diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-07-04 19:41:26 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2018-07-07 14:53:26 +0200 |
commit | c3bdb89e61084278a598d5af15da274cada1ecc6 (patch) | |
tree | b2c6e079000d62a03afe8175256082e5f2d56eed /target/linux/generic/pending-4.4/901-debloat_sock_diag.patch | |
parent | 1e6c30690ca902a69a727c925afaeccae8f85bcd (diff) | |
download | upstream-c3bdb89e61084278a598d5af15da274cada1ecc6.tar.gz upstream-c3bdb89e61084278a598d5af15da274cada1ecc6.tar.bz2 upstream-c3bdb89e61084278a598d5af15da274cada1ecc6.zip |
kernel: remove linux 4.4 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-4.4/901-debloat_sock_diag.patch')
-rw-r--r-- | target/linux/generic/pending-4.4/901-debloat_sock_diag.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/target/linux/generic/pending-4.4/901-debloat_sock_diag.patch b/target/linux/generic/pending-4.4/901-debloat_sock_diag.patch deleted file mode 100644 index 4733d1b79c..0000000000 --- a/target/linux/generic/pending-4.4/901-debloat_sock_diag.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/net/Kconfig -+++ b/net/Kconfig -@@ -92,6 +92,9 @@ source "net/netlabel/Kconfig" - - endif # if INET - -+config SOCK_DIAG -+ bool -+ - config NETWORK_SECMARK - bool "Security Marking" - help ---- a/net/core/Makefile -+++ b/net/core/Makefile -@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core. - - obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \ - neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ -- sock_diag.o dev_ioctl.o tso.o -+ dev_ioctl.o tso.o - -+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o - obj-$(CONFIG_XFRM) += flow.o - obj-y += net-sysfs.o - obj-$(CONFIG_PROC_FS) += net-procfs.o ---- a/net/core/sock.c -+++ b/net/core/sock.c -@@ -1474,9 +1474,11 @@ void sk_destruct(struct sock *sk) - - static void __sk_free(struct sock *sk) - { -+#ifdef CONFIG_SOCK_DIAG - if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt)) - sock_diag_broadcast_destroy(sk); - else -+#endif - sk_destruct(sk); - } - ---- a/net/ipv4/Kconfig -+++ b/net/ipv4/Kconfig -@@ -415,6 +415,7 @@ config INET_LRO - - config INET_DIAG - tristate "INET: socket monitoring interface" -+ select SOCK_DIAG - default y - ---help--- - Support for INET (TCP, DCCP, etc) socket monitoring interface used by ---- a/net/unix/Kconfig -+++ b/net/unix/Kconfig -@@ -22,6 +22,7 @@ config UNIX - config UNIX_DIAG - tristate "UNIX: socket monitoring interface" - depends on UNIX -+ select SOCK_DIAG - default n - ---help--- - Support for UNIX socket monitoring interface used by the ss tool. ---- a/net/netlink/Kconfig -+++ b/net/netlink/Kconfig -@@ -4,6 +4,7 @@ - - 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. |