diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 20:10:22 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 20:10:22 (GMT) |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /net/mac80211/util.c | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
| download | linux-fsl-qoriq-5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index d036597..556647a 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -986,12 +986,6 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, u16 cap = sband->ht_cap.cap; __le16 tmp; - if (ieee80211_disable_40mhz_24ghz && - sband->band == IEEE80211_BAND_2GHZ) { - cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - cap &= ~IEEE80211_HT_CAP_SGI_40; - } - *pos++ = WLAN_EID_HT_CAPABILITY; *pos++ = sizeof(struct ieee80211_ht_cap); memset(pos, 0, sizeof(struct ieee80211_ht_cap)); |