diff options
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 93f2cda9926e..582396a4fdb5 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -403,12 +403,12 @@ ieee80211_rx_h_passive_scan(struct ieee80211_rx_data *rx) | |||
403 | struct ieee80211_local *local = rx->local; | 403 | struct ieee80211_local *local = rx->local; |
404 | struct sk_buff *skb = rx->skb; | 404 | struct sk_buff *skb = rx->skb; |
405 | 405 | ||
406 | if (unlikely(local->sta_hw_scanning)) | 406 | if (unlikely(local->hw_scanning)) |
407 | return ieee80211_sta_rx_scan(rx->sdata, skb, rx->status); | 407 | return ieee80211_scan_rx(rx->sdata, skb, rx->status); |
408 | 408 | ||
409 | if (unlikely(local->sta_sw_scanning)) { | 409 | if (unlikely(local->sw_scanning)) { |
410 | /* drop all the other packets during a software scan anyway */ | 410 | /* drop all the other packets during a software scan anyway */ |
411 | if (ieee80211_sta_rx_scan(rx->sdata, skb, rx->status) | 411 | if (ieee80211_scan_rx(rx->sdata, skb, rx->status) |
412 | != RX_QUEUED) | 412 | != RX_QUEUED) |
413 | dev_kfree_skb(skb); | 413 | dev_kfree_skb(skb); |
414 | return RX_QUEUED; | 414 | return RX_QUEUED; |
@@ -1918,7 +1918,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, | |||
1918 | return; | 1918 | return; |
1919 | } | 1919 | } |
1920 | 1920 | ||
1921 | if (unlikely(local->sta_sw_scanning || local->sta_hw_scanning)) | 1921 | if (unlikely(local->sw_scanning || local->hw_scanning)) |
1922 | rx.flags |= IEEE80211_RX_IN_SCAN; | 1922 | rx.flags |= IEEE80211_RX_IN_SCAN; |
1923 | 1923 | ||
1924 | ieee80211_parse_qos(&rx); | 1924 | ieee80211_parse_qos(&rx); |