aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-03-26 09:02:26 -0400
committerJohannes Berg <johannes.berg@intel.com>2013-04-16 09:29:42 -0400
commit37799e52a29af2268d1fbe18908a0d6b9f68af88 (patch)
tree709de66fb30ca2a5d15afa0c8c5daf9e18cfb37b /net/mac80211/rx.c
parent6553bf04ff6686db658e09626edad003809f6baf (diff)
mac80211: unify CSA action frame/beacon processing
CSA action frame content should be processed as variable IEs rather than fixed to make it extensible. Unify the code and process them just like CSA in beacons to make it easier to extend for HT/VHT. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 5168f89c754d..e9825f15c14c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2507,10 +2507,6 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
2507 ieee80211_process_measurement_req(sdata, mgmt, len); 2507 ieee80211_process_measurement_req(sdata, mgmt, len);
2508 goto handled; 2508 goto handled;
2509 case WLAN_ACTION_SPCT_CHL_SWITCH: 2509 case WLAN_ACTION_SPCT_CHL_SWITCH:
2510 if (len < (IEEE80211_MIN_ACTION_SIZE +
2511 sizeof(mgmt->u.action.u.chan_switch)))
2512 break;
2513
2514 if (sdata->vif.type != NL80211_IFTYPE_STATION) 2510 if (sdata->vif.type != NL80211_IFTYPE_STATION)
2515 break; 2511 break;
2516 2512