diff --git a/[refs] b/[refs]
index 1d4087c6bdaf..fcc9f724e0cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97d3f458a1e3350dfcbdc3b6aefa75d20d59ee17
+refs/heads/master: 9955151df7c6452cae2ed9649f53d265c91cf155
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 1564a3018cf5..36e8e2de980c 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -558,6 +558,10 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
 	if (unlikely(!info->control.rates[0].count))
 		info->control.rates[0].count = 1;
 
+	if (WARN_ON_ONCE((info->control.rates[0].count > 1) &&
+			 (info->flags & IEEE80211_TX_CTL_NO_ACK)))
+		info->control.rates[0].count = 1;
+
 	if (is_multicast_ether_addr(hdr->addr1)) {
 		/*
 		 * XXX: verify the rate is in the basic rateset