From 703515f889124248480f39d65f8704548cbf1c09 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 24 Feb 2017 11:57:27 +0100 Subject: mac80211: sync with master branch as of 9edff13abd97 Includes the following changes: 9edff13abd mac80211: disable potentially harmful PS software retry for A-MPDU sessions 75216a76b0 mac80211: backport upstream fix for CSA in IBSS mode 368cc8ef47 mac80211: update brcmfmac backporting brcmf_err cleanups 66a63d25c4 mac80211: fix build on linux 3.18 9eacb9d7fc rt2x00: mt7620: lots of improvements fd94fa61a7 mac80211: brcmfmac: update Raspberry Pi patches for linux 4.9 649e766a64 mac80211: update to wireless-testing 2017-01-31 47540afa5d ath9k: add a warning to the tx99 config option b367eef21d mac80211: rt2x00: add support for external LNA on MT7620 9200e168f2 mac80211: move (& update) upstream accepted brcmfmac patches Signed-off-by: Felix Fietkau --- .../349-mac80211-fix-legacy-invalid-rxrate.patch | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 package/kernel/mac80211/patches/349-mac80211-fix-legacy-invalid-rxrate.patch (limited to 'package/kernel/mac80211/patches/349-mac80211-fix-legacy-invalid-rxrate.patch') diff --git a/package/kernel/mac80211/patches/349-mac80211-fix-legacy-invalid-rxrate.patch b/package/kernel/mac80211/patches/349-mac80211-fix-legacy-invalid-rxrate.patch deleted file mode 100644 index c160515892..0000000000 --- a/package/kernel/mac80211/patches/349-mac80211-fix-legacy-invalid-rxrate.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a17d93ff3a950fefaea40e4a4bf3669b9137c533 Mon Sep 17 00:00:00 2001 -From: Ben Greear -Date: Wed, 14 Dec 2016 11:30:38 -0800 -Subject: [PATCH] mac80211: fix legacy and invalid rx-rate report - -This fixes obtaining the rate info via sta_set_sinfo -when the rx rate is invalid (for instance, on IBSS -interface that has received no frames from one of its -peers). - -Also initialize rinfo->flags for legacy rates, to not -rely on the whole sinfo being initialized to zero. - -Signed-off-by: Ben Greear -Signed-off-by: Johannes Berg ---- - net/mac80211/sta_info.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/net/mac80211/sta_info.c -+++ b/net/mac80211/sta_info.c -@@ -1975,6 +1975,7 @@ static void sta_stats_decode_rate(struct - u16 brate; - unsigned int shift; - -+ rinfo->flags = 0; - sband = local->hw.wiphy->bands[(rate >> 4) & 0xf]; - brate = sband->bitrates[rate & 0xf].bitrate; - if (rinfo->bw == RATE_INFO_BW_5) -@@ -1990,14 +1991,15 @@ static void sta_stats_decode_rate(struct - rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI; - } - --static void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) -+static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) - { - u16 rate = ACCESS_ONCE(sta_get_last_rx_stats(sta)->last_rate); - - if (rate == STA_STATS_RATE_INVALID) -- rinfo->flags = 0; -- else -- sta_stats_decode_rate(sta->local, rate, rinfo); -+ return -EINVAL; -+ -+ sta_stats_decode_rate(sta->local, rate, rinfo); -+ return 0; - } - - static void sta_set_tidstats(struct sta_info *sta, -@@ -2202,8 +2204,8 @@ void sta_set_sinfo(struct sta_info *sta, - } - - if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE))) { -- sta_set_rate_info_rx(sta, &sinfo->rxrate); -- sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); -+ if (sta_set_rate_info_rx(sta, &sinfo->rxrate) == 0) -+ sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); - } - - sinfo->filled |= BIT(NL80211_STA_INFO_TID_STATS); -- cgit v1.2.3