diff options
| author | Luciano Coelho <coelho@ti.com> | 2011-05-11 17:09:36 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 15:12:27 -0400 |
| commit | 79f460ca49d8d5700756ab7071c951311c7f29cc (patch) | |
| tree | b11b62473697c6c1858b83b3abe5181990f85c19 /net/mac80211/rx.c | |
| parent | 807f8a8c300435d5483e8d78df9dcdbc27333166 (diff) | |
| download | linux-3.10-79f460ca49d8d5700756ab7071c951311c7f29cc.tar.gz linux-3.10-79f460ca49d8d5700756ab7071c951311c7f29cc.tar.bz2 linux-3.10-79f460ca49d8d5700756ab7071c951311c7f29cc.zip | |
mac80211: add support for HW scheduled scan
Implement support for HW scheduled scan. The mac80211 code doesn't perform
scheduled scans itself, but calls the driver to start and stop scheduled
scans.
This patch also creates a trace event class to be used by drv_hw_scan
and the new drv_sched_scan_start and drv_sched_stop functions, in
order to avoid duplicate code.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 634f3d97a27..1b9413fb383 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -404,11 +404,13 @@ ieee80211_rx_h_passive_scan(struct ieee80211_rx_data *rx) struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb); struct sk_buff *skb = rx->skb; - if (likely(!(status->rx_flags & IEEE80211_RX_IN_SCAN))) + if (likely(!(status->rx_flags & IEEE80211_RX_IN_SCAN) && + !local->sched_scanning)) return RX_CONTINUE; if (test_bit(SCAN_HW_SCANNING, &local->scanning) || - test_bit(SCAN_SW_SCANNING, &local->scanning)) + test_bit(SCAN_SW_SCANNING, &local->scanning) || + local->sched_scanning) return ieee80211_scan_rx(rx->sdata, skb); /* scanning finished during invoking of handlers */ |