1 files changed, 5 insertions, 0 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a35f37980e70..531477a62f4b 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -1465,6 +1465,11 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         memcpy(((struct ieee80211_mgmt *) skb->data)->da, mgmt->sa, ETH_ALEN);
         ibss_dbg(sdata, "Sending ProbeResp to %pM\n", mgmt->sa);
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
+
+        /* avoid excessive retries for probe request to wildcard SSIDs */
+        if (pos[1] == 0)
+                IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_NO_ACK;
+
         ieee80211_tx_skb(sdata, skb);
 }