From 061c6e23b446588ddb0a5d34787d0c2f37080277 Mon Sep 17 00:00:00 2001 From: Eyal Shapira Date: Tue, 12 Jun 2012 12:39:55 +0300 Subject: [PATCH] --- yaml --- r: 314839 b: refs/heads/master c: 8f1a8684a56b3640510c0610b5635f5a4fe366fd h: refs/heads/master i: 314837: 417a6e461e75e31aee75eaa356cb68cd99b43164 314835: fbf72ec0110b4439ee699b24104dc0cef477f1bb 314831: 5f60a1c6fbb947a377c206fdb4925fd1ce3f7877 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/tx.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 130d299a7214..a35de5cf02f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04414e2aa516c7af6aa316562e046c5aca025e33 +refs/heads/master: 8f1a8684a56b3640510c0610b5635f5a4fe366fd diff --git a/trunk/drivers/net/wireless/ti/wlcore/tx.c b/trunk/drivers/net/wireless/ti/wlcore/tx.c index 6983e7a829d0..8ee82b9f93f4 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/tx.c +++ b/trunk/drivers/net/wireless/ti/wlcore/tx.c @@ -305,11 +305,15 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif, if (is_dummy || !wlvif) rate_idx = 0; else if (wlvif->bss_type != BSS_TYPE_AP_BSS) { - /* if the packets are destined for AP (have a STA entry) - send them with AP rate policies, otherwise use default - basic rates */ + /* + * if the packets are destined for AP (have a STA entry) + * 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)) + rate_idx = wlvif->sta.basic_rate_idx; else if (control->control.sta) rate_idx = wlvif->sta.ap_rate_idx; else