mac80211: do not pass injected frames without a valid rate to the driver
authorFelix Fietkau <nbd@openwrt.org>
Wed, 2 Mar 2016 14:54:51 +0000 (15:54 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 5 Apr 2016 08:58:21 +0000 (10:58 +0200)
Fall back to rate control if the requested bitrate was not found.

Fixes: dfdfc2beb0dd ("mac80211: Parse legacy and HT rate in injected frames")
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/tx.c

index 51e225e..597c8fe 100644 (file)
@@ -1839,6 +1839,9 @@ static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
                        }
                }
 
+               if (info->control.rates[0].idx < 0)
+                       info->control.flags &= ~IEEE80211_TX_CTRL_RATE_INJECT;
+
                info->control.rates[0].flags = rate_flags;
                info->control.rates[0].count = min_t(u8, rate_retries + 1,
                                                     local->hw.max_rate_tries);