diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /net/mac80211/Kconfig | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'net/mac80211/Kconfig')
| -rw-r--r-- | net/mac80211/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 41a32cd919af..182c9c5c6818 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
| @@ -67,6 +67,7 @@ endmenu | |||
| 67 | config MAC80211_MESH | 67 | config MAC80211_MESH |
| 68 | bool "Enable mac80211 mesh networking (pre-802.11s) support" | 68 | bool "Enable mac80211 mesh networking (pre-802.11s) support" |
| 69 | depends on MAC80211 && EXPERIMENTAL | 69 | depends on MAC80211 && EXPERIMENTAL |
| 70 | depends on BROKEN | ||
| 70 | ---help--- | 71 | ---help--- |
| 71 | This options enables support of Draft 802.11s mesh networking. | 72 | This options enables support of Draft 802.11s mesh networking. |
| 72 | The implementation is based on Draft 1.08 of the Mesh Networking | 73 | The implementation is based on Draft 1.08 of the Mesh Networking |