diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-14 12:29:17 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-14 12:29:17 -0700 |
commit | a8519de4a030d130e0d18147a2af3112b7951e0b (patch) | |
tree | 59f89418cf7f311d896c38ff774398e052b709d8 /net/mac80211/Kconfig | |
parent | 5c16807d3d196203d2d3c9fae51ac7e422091904 (diff) | |
parent | 560ad81b6c90e0fddc4d6c280f16ddf18d47eeb1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/Kconfig')
-rw-r--r-- | net/mac80211/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 7dd77b6d4c9..9db4ff836a3 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -66,12 +66,12 @@ endmenu config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" depends on MAC80211 && EXPERIMENTAL - depends on BROKEN ---help--- This options enables support of Draft 802.11s mesh networking. - The implementation is based on Draft 1.08 of the Mesh Networking - amendment. For more information visit http://o11s.org/. - + The implementation is based on Draft 2.08 of the Mesh Networking + amendment. However, no compliance with that draft is claimed or even + possible, as drafts leave a number of identifiers to be defined after + ratification. For more information visit http://o11s.org/. config MAC80211_LEDS bool "Enable LED triggers" |