diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-05-01 03:37:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-01 21:02:42 +0200 |
| commit | ee1bec9b3b49ea05e97ef40a3d38b70628cb947a (patch) | |
| tree | 01c76120655039db9937a05418690fec41dc5859 /net | |
| parent | netpoll: convert mutex into a semaphore (diff) | |
| download | linux-ee1bec9b3b49ea05e97ef40a3d38b70628cb947a.tar.xz linux-ee1bec9b3b49ea05e97ef40a3d38b70628cb947a.zip | |
netlink: kconfig: move mmap i/o into netlink kconfig
Currently, in menuconfig, Netlink's new mmaped IO is the very first
entry under the ``Networking support'' item and comes even before
``Networking options'':
[ ] Netlink: mmaped IO
Networking options --->
...
Lets move this into ``Networking options'' under netlink's Kconfig,
since this might be more appropriate. Introduced by commit ccdfcc398
(``netlink: mmaped netlink: ring setup'').
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 9 | ||||
| -rw-r--r-- | net/netlink/Kconfig | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/Kconfig b/net/Kconfig index 1a2221630e6a..2ddc9046868e 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -23,15 +23,6 @@ menuconfig NET if NET -config NETLINK_MMAP - bool "Netlink: mmaped IO" - help - This option enables support for memory mapped netlink IO. This - reduces overhead by avoiding copying data between kernel- and - userspace. - - If unsure, say N. - config WANT_COMPAT_NETLINK_MESSAGES bool help diff --git a/net/netlink/Kconfig b/net/netlink/Kconfig index 5d6e8c05b3d4..2c5e95e9bfbd 100644 --- a/net/netlink/Kconfig +++ b/net/netlink/Kconfig @@ -2,6 +2,15 @@ # Netlink Sockets # +config NETLINK_MMAP + bool "NETLINK: mmaped IO" + ---help--- + This option enables support for memory mapped netlink IO. This + reduces overhead by avoiding copying data between kernel- and + userspace. + + If unsure, say N. + config NETLINK_DIAG tristate "NETLINK: socket monitoring interface" default n |