diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-09 06:13:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:06 -0400 |
commit | d9fe60dea7779d412b34679f1177c5ca1940ea8d (patch) | |
tree | a51e16b013f7c1d16ded502cb32c03872bcbfcaa /net/mac80211/wext.c | |
parent | 40333e4fb476014cdd939d27e20eb54573172b32 (diff) |
802.11: clean up/fix HT support
This patch cleans up a number of things:
* the unusable definition of the HT capabilities/HT information
information elements
* variable names that are hard to understand
* mac80211: move ieee80211_handle_ht to ht.c and remove the unused
enable_ht parameter
* mac80211: fix bug with MCS rate 32 in ieee80211_handle_ht
* mac80211: fix bug with casting the result of ieee80211_bss_get_ie
to an information element _contents_ rather than the
whole element, add size checking (another out-of-bounds
access bug fixed!)
* mac80211: remove some unused return values in favour of BUG_ON
checking
* a few minor other things
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/wext.c')
-rw-r--r-- | net/mac80211/wext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 29c41040c8c9..a3af15141244 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c | |||
@@ -147,7 +147,7 @@ static int ieee80211_ioctl_giwname(struct net_device *dev, | |||
147 | sband = local->hw.wiphy->bands[IEEE80211_BAND_5GHZ]; | 147 | sband = local->hw.wiphy->bands[IEEE80211_BAND_5GHZ]; |
148 | if (sband) { | 148 | if (sband) { |
149 | is_a = 1; | 149 | is_a = 1; |
150 | is_ht |= sband->ht_info.ht_supported; | 150 | is_ht |= sband->ht_cap.ht_supported; |
151 | } | 151 | } |
152 | 152 | ||
153 | sband = local->hw.wiphy->bands[IEEE80211_BAND_2GHZ]; | 153 | sband = local->hw.wiphy->bands[IEEE80211_BAND_2GHZ]; |
@@ -160,7 +160,7 @@ static int ieee80211_ioctl_giwname(struct net_device *dev, | |||
160 | if (sband->bitrates[i].bitrate == 60) | 160 | if (sband->bitrates[i].bitrate == 60) |
161 | is_g = 1; | 161 | is_g = 1; |
162 | } | 162 | } |
163 | is_ht |= sband->ht_info.ht_supported; | 163 | is_ht |= sband->ht_cap.ht_supported; |
164 | } | 164 | } |
165 | 165 | ||
166 | strcpy(name, "IEEE 802.11"); | 166 | strcpy(name, "IEEE 802.11"); |