diff options
author | Felix Fietkau <nbd@nbd.name> | 2017-02-24 11:57:27 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2017-02-24 12:22:29 +0100 |
commit | 703515f889124248480f39d65f8704548cbf1c09 (patch) | |
tree | cd06f11ec2cc4e6ddb75c8982ecaab9882d3a9ed /package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch | |
parent | d27dd6298b0f9a66199758b32ce19c0932ef2ee0 (diff) | |
download | mtk-20170518-703515f889124248480f39d65f8704548cbf1c09.zip mtk-20170518-703515f889124248480f39d65f8704548cbf1c09.tar.gz mtk-20170518-703515f889124248480f39d65f8704548cbf1c09.tar.bz2 |
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 <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch')
-rw-r--r-- | package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch b/package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch deleted file mode 100644 index eb1d5d3..0000000 --- a/package/kernel/mac80211/patches/357-0011-brcmfmac-use-requested-scan-interval-in-scheduled-sc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From c6989fd55ceb633d2f18c12ffae01b9123125c89 Mon Sep 17 00:00:00 2001 -From: Arend Van Spriel <arend.vanspriel@broadcom.com> -Date: Wed, 23 Nov 2016 10:25:30 +0000 -Subject: [PATCH] brcmfmac: use requested scan interval in scheduled scan - -User-space can specify the interval for the scheduled scan. This -interval is found in scheduled scan plan. The driver supports only -one plan, which is legacy behaviour. - -Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> -Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> -Reviewed-by: Franky Lin <franky.lin@broadcom.com> -Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 1 + - drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c | 6 +++++- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h | 6 ++++-- - 3 files changed, 10 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6312,6 +6312,7 @@ static void brcmf_wiphy_pno_params(struc - wiphy->max_sched_scan_ssids = BRCMF_PNO_MAX_PFN_COUNT; - wiphy->max_match_sets = BRCMF_PNO_MAX_PFN_COUNT; - wiphy->max_sched_scan_ie_len = BRCMF_SCAN_IE_LEN_MAX; -+ wiphy->max_sched_scan_plan_interval = BRCMF_PNO_SCHED_SCAN_MAX_PERIOD; - wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; - } - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c -@@ -63,6 +63,10 @@ static int brcmf_pno_config(struct brcmf - pfn_param.exp = BRCMF_PNO_FREQ_EXPO_MAX; - - /* set up pno scan fr */ -+ if (scan_freq < BRCMF_PNO_SCHED_SCAN_MIN_PERIOD) { -+ brcmf_dbg(SCAN, "scan period too small, using minimum\n"); -+ scan_freq = BRCMF_PNO_SCHED_SCAN_MIN_PERIOD; -+ } - pfn_param.scan_freq = cpu_to_le32(scan_freq); - - if (mscan) { -@@ -191,7 +195,7 @@ int brcmf_pno_start_sched_scan(struct br - } - - /* configure pno */ -- ret = brcmf_pno_config(ifp, BRCMF_PNO_SCHED_SCAN_PERIOD, 0, 0); -+ ret = brcmf_pno_config(ifp, req->scan_plans[0].interval, 0, 0); - if (ret < 0) - return ret; - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h -@@ -16,8 +16,10 @@ - #ifndef _BRCMF_PNO_H - #define _BRCMF_PNO_H - --#define BRCMF_PNO_SCAN_COMPLETE 1 --#define BRCMF_PNO_MAX_PFN_COUNT 16 -+#define BRCMF_PNO_SCAN_COMPLETE 1 -+#define BRCMF_PNO_MAX_PFN_COUNT 16 -+#define BRCMF_PNO_SCHED_SCAN_MIN_PERIOD 10 -+#define BRCMF_PNO_SCHED_SCAN_MAX_PERIOD 508 - - /** - * brcmf_pno_clean - disable and clear pno in firmware. |