diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2019-07-21 11:23:32 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2019-07-21 16:24:41 +0200 |
commit | bc0c0a55643f4ca69ef1f431d9c4542705d9bfb2 (patch) | |
tree | 16d9965a121f655640a943aee70217deb1af9df6 /package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch | |
parent | abe137ff5ee322321a7905e73f084514f2e86b38 (diff) | |
download | upstream-bc0c0a55643f4ca69ef1f431d9c4542705d9bfb2.tar.gz upstream-bc0c0a55643f4ca69ef1f431d9c4542705d9bfb2.tar.bz2 upstream-bc0c0a55643f4ca69ef1f431d9c4542705d9bfb2.zip |
mac80211: brcm: backport first set of 5.4 brcmfmac changes
This doesn't include 9ff8614a3dbe ("brcmfmac: use separate Kconfig file
for brcmfmac") due to a few conflicts with backports changes.
An important change is:
[PATCH 2/7] brcmfmac: change the order of things in brcmf_detach()
which fixes a rmmod crash in the brcmf_txfinalize().
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit db8e08a5a4469f98ed5d9b0ff3189e356f53d924)
Diffstat (limited to 'package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch')
-rw-r--r-- | package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch b/package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch new file mode 100644 index 0000000000..4b53924b02 --- /dev/null +++ b/package/kernel/mac80211/patches/brcm/383-v5.4-0002-brcmfmac-enable-DFS_OFFLOAD-extended-feature-if-supp.patch @@ -0,0 +1,63 @@ +From 3512f2144aa3bed33c4181958d6961266c2e3540 Mon Sep 17 00:00:00 2001 +From: Arend van Spriel <arend.vanspriel@broadcom.com> +Date: Thu, 11 Jul 2019 10:45:31 +0200 +Subject: [PATCH 2/3] brcmfmac: enable DFS_OFFLOAD extended feature if + supported + +If the firmware supports 802.11h and the device can operate in 5GHz +band we can enable DFS_OFFLOAD extended feature. + +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> +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +++++ + drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 + + drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +++- + 3 files changed, 9 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +@@ -6725,6 +6725,11 @@ static int brcmf_setup_wiphy(struct wiph + } + } + ++ if (wiphy->bands[NL80211_BAND_5GHZ] && ++ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DOT11H)) ++ wiphy_ext_feature_set(wiphy, ++ NL80211_EXT_FEATURE_DFS_OFFLOAD); ++ + wiphy_read_of_freq_limits(wiphy); + + return 0; +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +@@ -39,6 +39,7 @@ static const struct brcmf_feat_fwcap brc + { BRCMF_FEAT_P2P, "p2p" }, + { BRCMF_FEAT_MONITOR, "monitor" }, + { BRCMF_FEAT_MONITOR_FMT_RADIOTAP, "rtap" }, ++ { BRCMF_FEAT_DOT11H, "802.11h" } + }; + + #ifdef DEBUG +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +@@ -25,6 +25,7 @@ + * MONITOR: firmware can pass monitor packets to host. + * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header + * MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header ++ * DOT11H: firmware supports 802.11h + */ + #define BRCMF_FEAT_LIST \ + BRCMF_FEAT_DEF(MBSS) \ +@@ -43,7 +44,8 @@ + BRCMF_FEAT_DEF(FWSUP) \ + BRCMF_FEAT_DEF(MONITOR) \ + BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \ +- BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) ++ BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR) \ ++ BRCMF_FEAT_DEF(DOT11H) + + /* + * Quirks: |