diff options
| author | Johannes Berg | 2008-10-09 12:13:49 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-11-01 00:00:06 +0100 |
| commit | d9fe60dea7779d412b34679f1177c5ca1940ea8d (patch) | |
| tree | a51e16b013f7c1d16ded502cb32c03872bcbfcaa /net/mac80211/wext.c | |
| parent | p54: honour bss_info_changed's short slot time settings (diff) | |
| download | kernel-qcow2-linux-d9fe60dea7779d412b34679f1177c5ca1940ea8d.tar.gz kernel-qcow2-linux-d9fe60dea7779d412b34679f1177c5ca1940ea8d.tar.xz kernel-qcow2-linux-d9fe60dea7779d412b34679f1177c5ca1940ea8d.zip | |
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, sband = local->hw.wiphy->bands[IEEE80211_BAND_5GHZ]; if (sband) { is_a = 1; - is_ht |= sband->ht_info.ht_supported; + is_ht |= sband->ht_cap.ht_supported; } sband = local->hw.wiphy->bands[IEEE80211_BAND_2GHZ]; @@ -160,7 +160,7 @@ static int ieee80211_ioctl_giwname(struct net_device *dev, if (sband->bitrates[i].bitrate == 60) is_g = 1; } - is_ht |= sband->ht_info.ht_supported; + is_ht |= sband->ht_cap.ht_supported; } strcpy(name, "IEEE 802.11"); |