summaryrefslogtreecommitdiff
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-03-02 17:54:51 +0300
committerJohannes Berg <johannes.berg@intel.com>2016-04-05 11:58:21 +0300
commit07310a63147164eaf44a68932fbe9dbbde0fa82b (patch)
tree26454bca9e77f0d39a4a63b8da58d1de5ca68f71 /net/mac80211/tx.c
parentf66b60f6524c970d43af7a68dd50dcce289887e7 (diff)
downloadlinux-07310a63147164eaf44a68932fbe9dbbde0fa82b.tar.xz
mac80211: do not pass injected frames without a valid rate to the driver
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>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 51e225e4b450..597c8fe672a3 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -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);