2016-03-02 14:54:56

by Felix Fietkau

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 <[email protected]>
---
net/mac80211/tx.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index b294820..ea6e2d0 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1808,6 +1808,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);
--
2.2.2

2016-03-03 15:00:14

by Johannes Berg

Subject: Re: [PATCH] mac80211: do not pass injected frames without a valid rate to the driver

On Wed, 2016-03-02 at 15:54 +0100, Felix Fietkau wrote:
> Fall back to rate control if the requested bitrate was not found.
>
Applied, thakns.

johannes