From a04a8f136657e2438c7816da070e39ae760a02df Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Wed, 11 Jul 2012 18:01:49 +0300 Subject: [PATCH] --- yaml --- r: 315643 b: refs/heads/master c: 4340d1cf5f1a967074f5dabec09a06fc0ae52ac7 h: refs/heads/master i: 315641: e8e3c9b97e20fba2c88590690712addad6cd019b 315639: 12c835706401d92b85ada64d57e8cae099f3d5ae v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/tx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1f303477a30b..14459b26d69d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42066f9a5ffc212ec0ff5c23ed2fb92464191543 +refs/heads/master: 4340d1cf5f1a967074f5dabec09a06fc0ae52ac7 diff --git a/trunk/drivers/net/wireless/ti/wlcore/tx.c b/trunk/drivers/net/wireless/ti/wlcore/tx.c index 0bdc9500068e..c1d932043f05 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/tx.c +++ b/trunk/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;