diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-11-17 22:37:30 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-26 09:47:29 -0500 |
commit | a8efee4f4740c61fccaf73608df282c4ee24ae86 (patch) | |
tree | 62cf022a48bf59ee93c31817ce0bc251e9f95812 /drivers/net/wireless/ath9k/main.c | |
parent | fe7f4a77450c1d0e463a9b1456b40c2305433e41 (diff) |
ath9k: Use rate_driver_data
Remove the hack using vif, and use rate_driver_data within
skb->cb to hold driver specific rate information.
Setup the rate series in the skb's tx control area and remove
all references to ath9k specific rate series ( using struct ath_rc_series ).
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath9k/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index ca7809836c33..11d7bee2fda0 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -350,13 +350,12 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, | |||
350 | DPRINTF(sc, ATH_DBG_XMIT, | 350 | DPRINTF(sc, ATH_DBG_XMIT, |
351 | "%s: TX complete: skb: %p\n", __func__, skb); | 351 | "%s: TX complete: skb: %p\n", __func__, skb); |
352 | 352 | ||
353 | ieee80211_tx_info_clear_status(tx_info); | ||
354 | if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK || | 353 | if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK || |
355 | tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) { | 354 | tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) { |
356 | /* free driver's private data area of tx_info, XXX: HACK! */ | 355 | if (tx_info->rate_driver_data[0] != NULL) { |
357 | if (tx_info->control.vif != NULL) | 356 | kfree(tx_info->rate_driver_data[0]); |
358 | kfree(tx_info->control.vif); | 357 | tx_info->rate_driver_data[0] = NULL; |
359 | tx_info->control.vif = NULL; | 358 | } |
360 | } | 359 | } |
361 | 360 | ||
362 | if (tx_status->flags & ATH_TX_BAR) { | 361 | if (tx_status->flags & ATH_TX_BAR) { |