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>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index e2aeef8de70..c5765232528 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -209,7 +209,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
         /* TODO: set mactime */
         rx_status.freq = data->channel->center_freq;
         rx_status.band = data->channel->band;
-        rx_status.rate_idx = info->tx_rate_idx;
+        rx_status.rate_idx = info->control.rates[0].idx;
         /* TODO: simulate signal strength (and optional packet drop) */
 
         /* Copy skb to all enabled radios that are on the current frequency */
@@ -269,13 +269,9 @@ static int mac80211_hwsim_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (txi->control.sta)
                 hwsim_check_sta_magic(txi->control.sta);
 
-        memset(&txi->status, 0, sizeof(txi->status));
-        if (!(txi->flags & IEEE80211_TX_CTL_NO_ACK)) {
-                if (ack)
-                        txi->flags |= IEEE80211_TX_STAT_ACK;
-                else
-                        txi->status.excessive_retries = 1;
-        }
+        ieee80211_tx_info_clear_status(txi);
+        if (!(txi->flags & IEEE80211_TX_CTL_NO_ACK) && ack)
+                txi->flags |= IEEE80211_TX_STAT_ACK;
         ieee80211_tx_status_irqsafe(hw, skb);
         return NETDEV_TX_OK;
 }