diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-01-13 20:40:59 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-13 20:40:59 +0100 |
commit | f13352519ee8c4b22b87fc1a47743d1f53ea193e (patch) | |
tree | 48c18144f3e5e530ec61d5eadbb5a34675a69fe8 /drivers/net/wireless/brcm80211 | |
parent | Merge branch 'for-linville' of git://github.com/kvalo/ath (diff) | |
parent | mac80211_hwsim: restore regulatory testing functionality (diff) | |
download | linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.tar.xz linux-f13352519ee8c4b22b87fc1a47743d1f53ea193e.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index e71ce8c842a2..925034b80e9c 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -1071,7 +1071,6 @@ static int ieee_hw_init(struct ieee80211_hw *hw) hw->max_rates = 2; /* Primary rate and 1 fallback rate */ /* channel change time is dependent on chip and band */ - hw->channel_change_time = 7 * 1000; hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_ADHOC); |