| Message ID | 1413809838-9170-1-git-send-email-emmanuel.grumbach@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 2014-10-20 at 15:57 +0300, Emmanuel Grumbach wrote: > 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). Applied. For now, on mac80211-next, maybe we want to backport it later. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9ddd721..abba89d 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1956,8 +1956,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,
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> --- net/mac80211/mlme.c | 2 -- 1 file changed, 2 deletions(-)