aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-07-30 22:22:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-30 22:22:43 -0400
commitdf597efb5737063497f1a4f7c996cc9aec294230 (patch)
tree17bb60f68ee299d9717038197a932501625f1621 /net/mac80211/rx.c
parenta33bc5c15154c835aae26f16e6a3a7d9ad4acb45 (diff)
parent0a924578bc4a2823a95c151f56975c71f5c156bb (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 66c797cc85ce..b6ddde3848fb 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2439,6 +2439,18 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
2439 return; 2439 return;
2440 } 2440 }
2441 2441
2442 /*
2443 * If we're suspending, it is possible although not too likely
2444 * that we'd be receiving frames after having already partially
2445 * quiesced the stack. We can't process such frames then since
2446 * that might, for example, cause stations to be added or other
2447 * driver callbacks be invoked.
2448 */
2449 if (unlikely(local->quiescing || local->suspended)) {
2450 kfree_skb(skb);
2451 return;
2452 }
2453
2442 if (status->flag & RX_FLAG_HT) { 2454 if (status->flag & RX_FLAG_HT) {
2443 /* rate_idx is MCS index */ 2455 /* rate_idx is MCS index */
2444 if (WARN_ON(status->rate_idx < 0 || 2456 if (WARN_ON(status->rate_idx < 0 ||