From 4398ecd73dcf8554c0e495de082e4677440c1d5c Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 11 Apr 2015 10:28:14 +0000 Subject: generic: drop 3.14 Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45375 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.14/901-debloat_sock_diag.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 target/linux/generic/patches-3.14/901-debloat_sock_diag.patch (limited to 'target/linux/generic/patches-3.14/901-debloat_sock_diag.patch') diff --git a/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch b/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch deleted file mode 100644 index 7d18bbdc98..0000000000 --- a/target/linux/generic/patches-3.14/901-debloat_sock_diag.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/net/Kconfig -+++ b/net/Kconfig -@@ -88,6 +88,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 -+ dev_ioctl.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/ipv4/Kconfig -+++ b/net/ipv4/Kconfig -@@ -390,6 +390,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. -- cgit v1.2.3