diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /net/mac80211/mlme.c | |
parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
parent | ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8 (diff) |
Merge 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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index a82564e73d91..1e1d16c55ee5 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -1478,7 +1478,9 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, | |||
1478 | rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len); | 1478 | rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len); |
1479 | break; | 1479 | break; |
1480 | case IEEE80211_STYPE_ACTION: | 1480 | case IEEE80211_STYPE_ACTION: |
1481 | /* XXX: differentiate, can only happen for CSA now! */ | 1481 | if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT) |
1482 | break; | ||
1483 | |||
1482 | ieee80211_sta_process_chanswitch(sdata, | 1484 | ieee80211_sta_process_chanswitch(sdata, |
1483 | &mgmt->u.action.u.chan_switch.sw_elem, | 1485 | &mgmt->u.action.u.chan_switch.sw_elem, |
1484 | (void *)ifmgd->associated->priv); | 1486 | (void *)ifmgd->associated->priv); |