2012-12-17 17:11:39 +02:00
|
|
|
--- a/net/Kconfig
|
|
|
|
|
+++ b/net/Kconfig
|
|
|
|
|
@@ -87,6 +87,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
|
2012-12-18 17:13:31 +02:00
|
|
|
@@ -8,9 +8,9 @@ obj-y := sock.o request_sock.o skbuff.o
|
2012-12-17 17:11:39 +02:00
|
|
|
obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
+ neighbour.o rtnetlink.o utils.o link_watch.o filter.o
|
|
|
|
|
|
|
|
|
|
+obj-$(CONFIG_SOCK_DIAG) += sock_diag.o
|
|
|
|
|
obj-$(CONFIG_XFRM) += flow.o
|
|
|
|
|
obj-y += net-sysfs.o
|
|
|
|
|
obj-$(CONFIG_NET_PKTGEN) += pktgen.o
|
|
|
|
|
--- a/net/ipv4/Kconfig
|
|
|
|
|
+++ b/net/ipv4/Kconfig
|
|
|
|
|
@@ -404,6 +404,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.
|
