aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-09 08:49:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-11 15:53:39 -0400
commit39192c0bcf556c8521dcf0203714e9d48ac0b9f6 (patch)
treebb3ca5d74f06b2357644a5f1270924ca3bee02e9 /net/mac80211/rx.c
parentde1ede7ac3bd300f9aa565d0f93f6cf9ba74bb1a (diff)
mac80211: move spectrum management code out
Like the HT code, this doesn't depend on the STA-mode implementation and can be handled entirely independently. There's only stub code for now, but when it gets filled having it in its own file will be beneficial. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 71cce0bcc5be..d00ace78bf8d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1561,12 +1561,26 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
1561 ieee80211_process_delba(sdata, rx->sta, mgmt, len); 1561 ieee80211_process_delba(sdata, rx->sta, mgmt, len);
1562 break; 1562 break;
1563 } 1563 }
1564 rx->sta->rx_packets++; 1564 break;
1565 dev_kfree_skb(rx->skb); 1565 case WLAN_CATEGORY_SPECTRUM_MGMT:
1566 return RX_QUEUED; 1566 if (local->hw.conf.channel->band != IEEE80211_BAND_5GHZ)
1567 return RX_DROP_MONITOR;
1568 switch (mgmt->u.action.u.measurement.action_code) {
1569 case WLAN_ACTION_SPCT_MSR_REQ:
1570 if (len < (IEEE80211_MIN_ACTION_SIZE +
1571 sizeof(mgmt->u.action.u.measurement)))
1572 return RX_DROP_MONITOR;
1573 ieee80211_process_measurement_req(sdata, mgmt, len);
1574 break;
1575 }
1576 break;
1577 default:
1578 return RX_CONTINUE;
1567 } 1579 }
1568 1580
1569 return RX_CONTINUE; 1581 rx->sta->rx_packets++;
1582 dev_kfree_skb(rx->skb);
1583 return RX_QUEUED;
1570} 1584}
1571 1585
1572static ieee80211_rx_result debug_noinline 1586static ieee80211_rx_result debug_noinline