summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorEliad Peller2012-07-11 17:01:49 +0200
committerLuciano Coelho2012-07-18 14:08:21 +0200
commit4340d1cf5f1a967074f5dabec09a06fc0ae52ac7 (patch)
tree1edcf810a868a6aeb713369e07bb94c8b7685c1a /drivers/net
parentwlcore: don't issue SLEEP_AUTH command during recovery (diff)
downloadkernel-qcow2-linux-4340d1cf5f1a967074f5dabec09a06fc0ae52ac7.tar.gz
kernel-qcow2-linux-4340d1cf5f1a967074f5dabec09a06fc0ae52ac7.tar.xz
kernel-qcow2-linux-4340d1cf5f1a967074f5dabec09a06fc0ae52ac7.zip
wlcore: use basic rates for non-data packets
After the latest mac80211 changes, the sta has the ap's sta pointer even before association. This cause the auth and assoc frames to be sent with the standard ap's rates, rather than the basic rates. Change the tx rate policy logic to use the regular ap rates only for data packets (so control and mgmt packets will be sent with basic rates) Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ti/wlcore/tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 0bdc9500068e..c1d932043f05 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -306,7 +306,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
rate_idx = 0;
else if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
/*
- * if the packets are destined for AP (have a STA entry)
+ * if the packets are data packets
* send them with AP rate policies (EAPOLs are an exception),
* otherwise use default basic rates
*/
@@ -314,7 +314,7 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
rate_idx = wlvif->sta.basic_rate_idx;
else if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
rate_idx = wlvif->sta.p2p_rate_idx;
- else if (control->control.sta)
+ else if (ieee80211_is_data(frame_control))
rate_idx = wlvif->sta.ap_rate_idx;
else
rate_idx = wlvif->sta.basic_rate_idx;