diff --git a/[refs] b/[refs]
index 15423dd89112..0b3642a0e901 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfafba8a4c61841ab850887d6dfe2741ad037ab6
+refs/heads/master: 8a0f2ee37810aa4a4f46baf08b2ad587e138eb58
diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/drivers/net/wireless/wl12xx/tx.c
index a07ee8201d6d..fa518a5b7c8b 100644
--- a/trunk/drivers/net/wireless/wl12xx/tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/tx.c
@@ -336,7 +336,9 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 		/* if the packets are destined for AP (have a STA entry)
 		   send them with AP rate policies, otherwise use default
 		   basic rates */
-		if (control->control.sta)
+		if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
+			rate_idx = wlvif->sta.p2p_rate_idx;
+		else if (control->control.sta)
 			rate_idx = wlvif->sta.ap_rate_idx;
 		else
 			rate_idx = wlvif->sta.basic_rate_idx;