diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 23:46:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 23:46:52 +0100 |
| commit | 38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (patch) | |
| tree | 69ced9c509c864a67122c5e1337f14cd1d9e988d /net/unix | |
| parent | Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| parent | igmp: Avoid zero delay when receiving odd mixture of IGMP queries (diff) | |
| download | linux-38e5781bbf8e82c1635ea845e0d07b2228a5ac7a.tar.xz linux-38e5781bbf8e82c1635ea845e0d07b2228a5ac7a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
igmp: Avoid zero delay when receiving odd mixture of IGMP queries
netdev: make net_device_ops const
bcm63xx: make ethtool_ops const
usbnet: make ethtool_ops const
net: Fix build with INET disabled.
net: introduce netif_addr_lock_nested() and call if when appropriate
net: correct lock name in dev_[uc/mc]_sync documentations.
net: sk_update_clone is only used in net/core/sock.c
8139cp: fix missing napi_gro_flush.
pktgen: set correct max and min in pktgen_setup_inject()
smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h
asix: fix infinite loop in rx_fixup()
net: Default UDP and UNIX diag to 'n'.
r6040: fix typo in use of MCR0 register bits
net: fix sock_clone reference mismatch with tcp memcontrol
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/Kconfig b/net/unix/Kconfig index c2128b10e5f9..8b31ab85d050 100644 --- a/net/unix/Kconfig +++ b/net/unix/Kconfig @@ -22,7 +22,7 @@ config UNIX config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX - default UNIX + default n ---help--- Support for UNIX socket monitoring interface used by the ss tool. If unsure, say Y. |