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>

diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 0bdc9500068ec48081eec0216be299b99175c304..c1d932043f0522010e8780322134de36697297b6 100644 (file)
--- 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;