diff --git a/[refs] b/[refs] index 63021d69b6ec..1057496ff2eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff59dc76e6e996092e4e11f4a6a370702428ead5 +refs/heads/master: 5c142e8db4b2a10dad103d49f309381cb9fc6a87 diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig index 57bf358b2e7c..5ca576e77615 100644 --- a/trunk/net/mac80211/Kconfig +++ b/trunk/net/mac80211/Kconfig @@ -85,8 +85,9 @@ config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" depends on MAC80211 && EXPERIMENTAL && BROKEN ---help--- - This options enables support of pre-802.11s mesh interfaces. - For more information visit http://o11s.org + 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/. config MAC80211_LEDS