refresh patches
[openwrt/openwrt.git] / target / linux / generic / patches-3.7 / 901-debloat_sock_diag.patch
1 --- a/net/Kconfig
2 +++ b/net/Kconfig
3 @@ -87,6 +87,9 @@ source "net/netlabel/Kconfig"
4
5 endif # if INET
6
7 +config SOCK_DIAG
8 + bool
9 +
10 config NETWORK_SECMARK
11 bool "Security Marking"
12 help
13 --- a/net/core/Makefile
14 +++ b/net/core/Makefile
15 @@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o
16 obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
17
18 obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
19 - neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
20 - sock_diag.o
21 + neighbour.o rtnetlink.o utils.o link_watch.o filter.o
22
23 +obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
24 obj-$(CONFIG_XFRM) += flow.o
25 obj-y += net-sysfs.o
26 obj-$(CONFIG_NET_PKTGEN) += pktgen.o
27 --- a/net/ipv4/Kconfig
28 +++ b/net/ipv4/Kconfig
29 @@ -404,6 +404,7 @@ config INET_LRO
30
31 config INET_DIAG
32 tristate "INET: socket monitoring interface"
33 + select SOCK_DIAG
34 default y
35 ---help---
36 Support for INET (TCP, DCCP, etc) socket monitoring interface used by
37 --- a/net/unix/Kconfig
38 +++ b/net/unix/Kconfig
39 @@ -22,6 +22,7 @@ config UNIX
40 config UNIX_DIAG
41 tristate "UNIX: socket monitoring interface"
42 depends on UNIX
43 + select SOCK_DIAG
44 default n
45 ---help---
46 Support for UNIX socket monitoring interface used by the ss tool.