diff --git a/[refs] b/[refs] index abc9d5ce2fed..01e1ddadfc9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ba0a3be6ecc3a0b0d52c2a818b05564c6b42510 +refs/heads/master: 48f6edceb02d7a5173e7184c181ec054e47acc61 diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig index b4ecf267a34b..ff57ecc71be3 100644 --- a/trunk/net/mac80211/Kconfig +++ b/trunk/net/mac80211/Kconfig @@ -81,7 +81,7 @@ comment "Some wireless drivers require a rate control algorithm" config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" - depends on MAC80211 && EXPERIMENTAL + depends on MAC80211 ---help--- This options enables support of Draft 802.11s mesh networking. The implementation is based on Draft 2.08 of the Mesh Networking