diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-04-30 21:37:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-05-01 15:02:42 -0400 |
commit | ee1bec9b3b49ea05e97ef40a3d38b70628cb947a (patch) | |
tree | 01c76120655039db9937a05418690fec41dc5859 /net | |
parent | bd7c4b604a6cd707803c7c6ba142bfa131f9a9f3 (diff) |
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 | |||
23 | 23 | ||
24 | if NET | 24 | if NET |
25 | 25 | ||
26 | config NETLINK_MMAP | ||
27 | bool "Netlink: mmaped IO" | ||
28 | help | ||
29 | This option enables support for memory mapped netlink IO. This | ||
30 | reduces overhead by avoiding copying data between kernel- and | ||
31 | userspace. | ||
32 | |||
33 | If unsure, say N. | ||
34 | |||
35 | config WANT_COMPAT_NETLINK_MESSAGES | 26 | config WANT_COMPAT_NETLINK_MESSAGES |
36 | bool | 27 | bool |
37 | help | 28 | 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 @@ | |||
2 | # Netlink Sockets | 2 | # Netlink Sockets |
3 | # | 3 | # |
4 | 4 | ||
5 | config NETLINK_MMAP | ||
6 | bool "NETLINK: mmaped IO" | ||
7 | ---help--- | ||
8 | This option enables support for memory mapped netlink IO. This | ||
9 | reduces overhead by avoiding copying data between kernel- and | ||
10 | userspace. | ||
11 | |||
12 | If unsure, say N. | ||
13 | |||
5 | config NETLINK_DIAG | 14 | config NETLINK_DIAG |
6 | tristate "NETLINK: socket monitoring interface" | 15 | tristate "NETLINK: socket monitoring interface" |
7 | default n | 16 | default n |