diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:20 -0500 |
| commit | b55813a2e50088ca30df33fa62aeed5d3adb1796 (patch) | |
| tree | be50fe404e94869fe854766e190a5753dbc7dd49 /drivers/net | |
| parent | 368d17e068f691dba5a4f122c271db5ec9b2ebd6 (diff) | |
| parent | 9e19bb6d7a0959f5028d46e1ab99c50f0d36eda8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NETFILTER] x_table.c: sem2mutex
[IPV4]: Aggregate route entries with different TOS values
[TCP]: Mark tcp_*mem[] __read_mostly.
[TCP]: Set default max buffers from memory pool size
[SCTP]: Fix up sctp_rcv return value
[NET]: Take RTNL when unregistering notifier
[WIRELESS]: Fix config dependencies.
[NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms.
[NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
[MODULES]: Don't allow statically declared exports
[BRIDGE]: Unaligned accesses in the ethernet bridge
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 6a1033ec06cf..fd17aa8491b6 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
| @@ -27,6 +27,7 @@ config NET_RADIO | |||
| 27 | 27 | ||
| 28 | config NET_WIRELESS_RTNETLINK | 28 | config NET_WIRELESS_RTNETLINK |
| 29 | bool "Wireless Extension API over RtNetlink" | 29 | bool "Wireless Extension API over RtNetlink" |
| 30 | depends on NET_RADIO | ||
| 30 | ---help--- | 31 | ---help--- |
| 31 | Support the Wireless Extension API over the RtNetlink socket | 32 | Support the Wireless Extension API over the RtNetlink socket |
| 32 | in addition to the traditional ioctl interface (selected above). | 33 | in addition to the traditional ioctl interface (selected above). |