diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
| commit | 1e5b7c17b031359a37ed7772b92cc98aaaeac727 (patch) | |
| tree | 5e2a88ef16da6f5c7c3b74ef607e5ba892252d5b /package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch | |
| parent | ee1e8c2f2df3b03ef89e5a8b31ae9e2f9907ade1 (diff) | |
| download | upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.gz upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.bz2 upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.zip | |
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net>
Also update mt76 to update for API changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44655
Diffstat (limited to 'package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch b/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch deleted file mode 100644 index 4d1465cabb..0000000000 --- a/package/kernel/mac80211/patches/322-mac80211-add-more-missing-checks-for-VHT-tx-rates.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Fri, 21 Nov 2014 23:27:33 +0100 -Subject: [PATCH] mac80211: add more missing checks for VHT tx rates - -Fixes a crash on attempting to calculate the frame duration for a VHT -packet (which needs to be handled by hw/driver instead). - -Reported-by: Jouni Malinen <j@w1.fi> -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/net/mac80211/rate.c -+++ b/net/mac80211/rate.c -@@ -446,7 +446,8 @@ static void rate_fixup_ratelist(struct i - * - * XXX: Should this check all retry rates? - */ -- if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) { -+ if (!(rates[0].flags & -+ (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS))) { - u32 basic_rates = vif->bss_conf.basic_rates; - s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0; - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -60,7 +60,7 @@ static __le16 ieee80211_duration(struct - rcu_read_unlock(); - - /* assume HW handles this */ -- if (tx->rate.flags & IEEE80211_TX_RC_MCS) -+ if (tx->rate.flags & (IEEE80211_TX_RC_MCS | IEEE80211_TX_RC_VHT_MCS)) - return 0; - - /* uh huh? */ |