Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / ti / wlcore / tx.c

diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 6a28aeecf004db4c9fb553ca33197f0951ae4cd8..f0081f746482d8060810d27486c58e50d79df928 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -306,22 +306,24 @@ 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
                 */
-               if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
-                       rate_idx = wlvif->sta.p2p_rate_idx;
-               else if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+               if (skb->protocol == cpu_to_be16(ETH_P_PAE))
                        rate_idx = wlvif->sta.basic_rate_idx;
-               else if (control->control.sta)
+               else if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
+                       rate_idx = wlvif->sta.p2p_rate_idx;
+               else if (ieee80211_is_data(frame_control))
                        rate_idx = wlvif->sta.ap_rate_idx;
                else
                        rate_idx = wlvif->sta.basic_rate_idx;
        } else {
                if (hlid == wlvif->ap.global_hlid)
                        rate_idx = wlvif->ap.mgmt_rate_idx;
-               else if (hlid == wlvif->ap.bcast_hlid)
+               else if (hlid == wlvif->ap.bcast_hlid ||
+                        skb->protocol == cpu_to_be16(ETH_P_PAE))
+                       /* send AP bcast and EAPOLs using the min basic rate */
                        rate_idx = wlvif->ap.bcast_rate_idx;
                else
                        rate_idx = wlvif->ap.ucast_rate_idx[ac];
@@ -912,8 +914,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 /* Called upon reception of a TX complete interrupt */
 int wlcore_tx_complete(struct wl1271 *wl)
 {
-       struct wl1271_acx_mem_map *memmap =
-               (struct wl1271_acx_mem_map *)wl->target_mem_map;
+       struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
        u32 count, fw_counter;
        u32 i;
        int ret;