summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-10-20 15:57:18 +0300
committerJohannes Berg <johannes.berg@intel.com>2014-10-27 08:48:34 +0100
commitcfede0d80d785cc6d972cad2df2df0a502312d25 (patch)
treef4fcc5427e8124155739c37bb0ce195e987274d1 /net/mac80211
parentb5dfae020b3539feaa014d3b6152f48660c2d75b (diff)
downloadblackbird-op-linux-cfede0d80d785cc6d972cad2df2df0a502312d25.tar.gz
blackbird-op-linux-cfede0d80d785cc6d972cad2df2df0a502312d25.zip
mac80211: don't flush when probing the AP
All the callers of ieee80211_mgd_probe_ap_send return right after they call the flush() callback. This means that calling flush() is uneeded since its meaning is to wait until the queues of the device are empty. Devices that know how to report status on Tx will do so using the regular path (ieee80211_tx_status) and this status will trigger the continuation of the flow of the probe (ieee80211_sta_tx_notify). Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 4d9b4d165ce8..c078cd344ca4 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2207,8 +2207,6 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
ifmgd->probe_timeout = jiffies + msecs_to_jiffies(probe_wait_ms);
run_again(sdata, ifmgd->probe_timeout);
- if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
- ieee80211_flush_queues(sdata->local, sdata);
}
static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
OpenPOWER on IntegriCloud