diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-06-13 09:01:22 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-13 09:01:28 +0200 |
| commit | 627ae3ddd6f929b4496502318a8896729fc37839 (patch) | |
| tree | 269fc2ea3b49c16864e97ee6b2ed0e7530bed79a /drivers/net/wireless/mwifiex/main.c | |
| parent | 7bc057ffb5078d3e7f391ef2357f4ab01b9694e0 (diff) | |
| parent | a59f975a78f0606a3a364939dfa9b949d5f87521 (diff) | |
| download | blackbird-op-linux-627ae3ddd6f929b4496502318a8896729fc37839.tar.gz blackbird-op-linux-627ae3ddd6f929b4496502318a8896729fc37839.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 3192855c31c0..0f06f07a70e6 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -244,8 +244,8 @@ process_start: } } - if (!adapter->scan_processing && !adapter->data_sent && - !mwifiex_wmm_lists_empty(adapter)) { + if ((!adapter->scan_processing || adapter->scan_delay_cnt) && + !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter)) { mwifiex_wmm_process_tx(adapter); if (adapter->hs_activated) { adapter->is_hs_configured = false; |
