From e0db7781bef5be32b56ae4f50e4d3e19a435d0d6 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Tue, 1 Nov 2011 09:23:52 +0200 Subject: [PATCH] --- yaml --- r: 278717 b: refs/heads/master c: 8a0f2ee37810aa4a4f46baf08b2ad587e138eb58 h: refs/heads/master i: 278715: 8eebf589b59f3a32bdde6ab92719bca75e9d6d55 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/tx.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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;