diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-21 06:40:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:23 -0400 |
commit | e6a9854b05c1a6af1308fe2b8c68f35abf28a3ee (patch) | |
tree | 241f611f8194586ccabf61bacb060508773b9d05 /drivers/net/wireless/libertas_tf | |
parent | cb121bad67a32cde37adc2729b7e18aa4fd3063e (diff) |
mac80211/drivers: rewrite the rate control API
So after the previous changes we were still unhappy with how
convoluted the API is and decided to make things simpler for
everybody. This completely changes the rate control API, now
taking into account 802.11n with MCS rates and more control,
most drivers don't support that though.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
-rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 241ddcfa352..d1fc305de5f 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -592,14 +592,14 @@ EXPORT_SYMBOL_GPL(lbtf_remove_card); | |||
592 | void lbtf_send_tx_feedback(struct lbtf_private *priv, u8 retrycnt, u8 fail) | 592 | void lbtf_send_tx_feedback(struct lbtf_private *priv, u8 retrycnt, u8 fail) |
593 | { | 593 | { |
594 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv->tx_skb); | 594 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv->tx_skb); |
595 | memset(&info->status, 0, sizeof(info->status)); | 595 | |
596 | ieee80211_tx_info_clear_status(info); | ||
596 | /* | 597 | /* |
597 | * Commented out, otherwise we never go beyond 1Mbit/s using mac80211 | 598 | * Commented out, otherwise we never go beyond 1Mbit/s using mac80211 |
598 | * default pid rc algorithm. | 599 | * default pid rc algorithm. |
599 | * | 600 | * |
600 | * info->status.retry_count = MRVL_DEFAULT_RETRIES - retrycnt; | 601 | * info->status.retry_count = MRVL_DEFAULT_RETRIES - retrycnt; |
601 | */ | 602 | */ |
602 | info->status.excessive_retries = fail ? 1 : 0; | ||
603 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && !fail) | 603 | if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && !fail) |
604 | info->flags |= IEEE80211_TX_STAT_ACK; | 604 | info->flags |= IEEE80211_TX_STAT_ACK; |
605 | skb_pull(priv->tx_skb, sizeof(struct txpd)); | 605 | skb_pull(priv->tx_skb, sizeof(struct txpd)); |