aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-02-22 01:38:41 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-03-09 15:03:05 -0500
commit0a34332f669dbcd9efc13a45b30985c30ba8f65e (patch)
tree256b01f838453ff594be210faf6409554b06bbdb /drivers/net
parent04e36fc5f1ff4e349ea21de8d15e4e1844d04197 (diff)
wl1271: Disable host TX rate control
Disable host TX rate control. The wl1271 firmware is already managing rate control, so this eliminate unnecessary host processing. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c3
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_tx.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index f10ba847689d..0a4ff7b02f59 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1973,7 +1973,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
1973 wl->hw->flags = IEEE80211_HW_SIGNAL_DBM | 1973 wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
1974 IEEE80211_HW_NOISE_DBM | 1974 IEEE80211_HW_NOISE_DBM |
1975 IEEE80211_HW_BEACON_FILTER | 1975 IEEE80211_HW_BEACON_FILTER |
1976 IEEE80211_HW_SUPPORTS_PS; 1976 IEEE80211_HW_SUPPORTS_PS |
1977 IEEE80211_HW_HAS_RATE_CONTROL;
1977 1978
1978 wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | 1979 wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
1979 BIT(NL80211_IFTYPE_ADHOC); 1980 BIT(NL80211_IFTYPE_ADHOC);
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/wl1271_tx.c
index 1b11e2caabd6..6d109df9a0a0 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -350,6 +350,8 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
350 result->id, skb, result->ack_failures, 350 result->id, skb, result->ack_failures,
351 result->rate_class_index, result->status); 351 result->rate_class_index, result->status);
352 352
353 /* FIXME: do we need to tell the stack about the used rate? */
354
353 /* return the packet to the stack */ 355 /* return the packet to the stack */
354 ieee80211_tx_status(wl->hw, skb); 356 ieee80211_tx_status(wl->hw, skb);
355 wl->tx_frames[result->id] = NULL; 357 wl->tx_frames[result->id] = NULL;