diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-09-02 14:18:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 14:18:09 -0700 |
| commit | 3f968de276a8e585deb182d4ba56013a479c80bc (patch) | |
| tree | bff8932bb5e64c22708aad48a6edbef3a707a774 /net | |
| parent | net: file_operations should be const (diff) | |
| parent | ath9k: Reconfigure beacon timers after the scan is completed. (diff) | |
| download | linux-dev-3f968de276a8e585deb182d4ba56013a479c80bc.tar.xz linux-dev-3f968de276a8e585deb182d4ba56013a479c80bc.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/Kconfig | 5 | ||||
| -rw-r--r-- | net/wireless/Kconfig | 4 | ||||
| -rw-r--r-- | net/wireless/scan.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 9db4ff836a3d..4d5543af3123 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -13,8 +13,7 @@ config MAC80211 comment "CFG80211 needs to be enabled for MAC80211" depends on CFG80211=n -menu "Rate control algorithm selection" - depends on MAC80211 != n +if MAC80211 != n config MAC80211_RC_PID bool "PID controller based rate control algorithm" if EMBEDDED @@ -61,7 +60,7 @@ config MAC80211_RC_DEFAULT default "pid" if MAC80211_RC_DEFAULT_PID default "" -endmenu +endif config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index aea7e6824af9..68c504fab122 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -40,6 +40,10 @@ config CFG80211_REG_DEBUG default n ---help--- You can enable this if you want to debug regulatory changes. + For more information on cfg80211 regulatory refer to the wireless + wiki: + + http://wireless.kernel.org/en/developers/Regulatory If unsure, say N. diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7043de6221ab..19c5a9a8d085 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -141,7 +141,7 @@ void cfg80211_bss_expire(struct cfg80211_registered_device *dev) dev->bss_generation++; } -static u8 *find_ie(u8 num, u8 *ies, size_t len) +static u8 *find_ie(u8 num, u8 *ies, int len) { while (len > 2 && ies[0] != num) { len -= ies[1] + 2; |