diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-03-02 14:57:49 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-02 14:57:49 +0000 |
| commit | 197d34388bad921867276218ff33fee0de1c6e6c (patch) | |
| tree | d5ae61876759730929573825b6094f7f663a1806 /package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch | |
| parent | 7a4bf5434d3919fafb15cc8a55789e38998b6462 (diff) | |
| download | upstream-197d34388bad921867276218ff33fee0de1c6e6c.tar.gz upstream-197d34388bad921867276218ff33fee0de1c6e6c.tar.bz2 upstream-197d34388bad921867276218ff33fee0de1c6e6c.zip | |
mac80211: add a number of pending fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r48883
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48884 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch b/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch new file mode 100644 index 0000000000..d7452c29c1 --- /dev/null +++ b/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch @@ -0,0 +1,23 @@ +From: Felix Fietkau <nbd@openwrt.org> +Date: Wed, 2 Mar 2016 15:51:40 +0100 +Subject: [PATCH] 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> +--- + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1837,6 +1837,9 @@ static bool ieee80211_parse_tx_radiotap( + } + } + ++ 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); |