summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-11-01 08:23:52 +0100
committerLuciano Coelho <coelho@ti.com>2011-11-08 14:50:09 +0100
commit8a0f2ee37810aa4a4f46baf08b2ad587e138eb58 (patch)
tree6c7dfe67b0a829b3ace874d78d0761235d6aa651
parentwl12xx: set scan probe requests rate according to the no_cck flag (diff)
downloadlinux-8a0f2ee37810aa4a4f46baf08b2ad587e138eb58.tar.xz
linux-8a0f2ee37810aa4a4f46baf08b2ad587e138eb58.zip
wl12xx: use p2p rate index when the skb has the NO_CCK flag
If the skb contains the NO_CCK flag, use the p2p rate index (which contains only the OFDM rates) Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r--drivers/net/wireless/wl12xx/tx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index a07ee8201d6d..fa518a5b7c8b 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/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;