diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-14 23:19:16 -0700 |
| commit | ab55570d64d5409fa940e85dd8de2594b160f826 (patch) | |
| tree | 4010f080f2631e046ee4b5dcb29c8df2cfb9ee7e /net/mac80211/mlme.c | |
| parent | eef9d90dcde7bb4d029b67ed36457efc4970d5a2 (diff) | |
| parent | 8713a7ccd88d93d9f8a72436088d6627c82490db (diff) | |
| download | blackbird-op-linux-ab55570d64d5409fa940e85dd8de2594b160f826.tar.gz blackbird-op-linux-ab55570d64d5409fa940e85dd8de2594b160f826.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 49f86fa56bff..87665d7bb4f9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1348,10 +1348,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, (ifsta->flags & IEEE80211_STA_WMM_ENABLED)) { struct ieee80211_ht_bss_info bss_info; ieee80211_ht_cap_ie_to_ht_info( - (struct ieee80211_ht_cap *) elems.ht_cap_elem, &sta->sta.ht_info); ieee80211_ht_addt_info_ie_to_ht_bss_info( - (struct ieee80211_ht_addt_info *) elems.ht_info_elem, &bss_info); ieee80211_handle_ht(local, 1, &sta->sta.ht_info, &bss_info); } @@ -1709,7 +1707,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, struct ieee80211_ht_bss_info bss_info; ieee80211_ht_addt_info_ie_to_ht_bss_info( - (struct ieee80211_ht_addt_info *) elems.ht_info_elem, &bss_info); changed |= ieee80211_handle_ht(local, 1, &conf->ht_conf, &bss_info); |
