kernel/3.1[02]: move MTD root device setup code to mtdcore
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 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 @@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.
16
17 obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \
18 neighbour.o rtnetlink.o utils.o link_watch.o filter.o \
19 - sock_diag.o dev_ioctl.o
20 + dev_ioctl.o
21
22 +obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
23 obj-$(CONFIG_XFRM) += flow.o
24 obj-y += net-sysfs.o
25 obj-$(CONFIG_PROC_FS) += net-procfs.o
26 --- a/net/ipv4/Kconfig
27 +++ b/net/ipv4/Kconfig
28 @@ -411,6 +411,7 @@ config INET_LRO
29
30 config INET_DIAG
31 tristate "INET: socket monitoring interface"
32 + select SOCK_DIAG
33 default y
34 ---help---
35 Support for INET (TCP, DCCP, etc) socket monitoring interface used by
36 --- a/net/unix/Kconfig
37 +++ b/net/unix/Kconfig
38 @@ -22,6 +22,7 @@ config UNIX
39 config UNIX_DIAG
40 tristate "UNIX: socket monitoring interface"
41 depends on UNIX
42 + select SOCK_DIAG
43 default n
44 ---help---
45 Support for UNIX socket monitoring interface used by the ss tool.