diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-01-17 22:41:18 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-01-18 07:49:52 +0100 |
commit | 9200e168f25e94a4b514f581e2e1f49048caa82f (patch) | |
tree | 1159945118be1892118bf9d44ac096985e59fcad /package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch | |
parent | a68b1b9c8a4ca4f07494810e574172cbbfae2c87 (diff) | |
download | upstream-9200e168f25e94a4b514f581e2e1f49048caa82f.tar.gz upstream-9200e168f25e94a4b514f581e2e1f49048caa82f.tar.bz2 upstream-9200e168f25e94a4b514f581e2e1f49048caa82f.zip |
mac80211: move (& update) upstream accepted brcmfmac patches
These 3 patches are now in wireless-drivers-next tree.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch')
-rw-r--r-- | package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch b/package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch deleted file mode 100644 index 2826c733ba..0000000000 --- a/package/kernel/mac80211/patches/842-brcmfmac-setup-wiphy-bands-after-registering-it-firs.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> -Date: Sat, 7 Jan 2017 21:36:05 +0100 -Subject: [PATCH] brcmfmac: setup wiphy bands after registering it first -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -During bands setup we disable all channels that firmware doesn't support -in the current regulatory setup. If we do this before wiphy_register -it will result in copying set flags (including IEEE80211_CHAN_DISABLED) -to the orig_flags which is supposed to be persistent. We don't want this -as regulatory change may result in enabling some channels. We shouldn't -mess with orig_flags then (by changing them or ignoring them) so it's -better to just take care of their proper values. - -This patch cleanups code a bit (by taking orig_flags more seriously) and -allows further improvements like disabling really unavailable channels. -We will need that e.g. if some frequencies should be disabled for good -due to hardware setup (design). - -Signed-off-by: Rafał Miłecki <rafal@milecki.pl> -Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> ---- - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6564,8 +6564,7 @@ static int brcmf_setup_wiphy(struct wiph - wiphy->bands[NL80211_BAND_5GHZ] = band; - } - } -- err = brcmf_setup_wiphybands(wiphy); -- return err; -+ return 0; - } - - static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg) -@@ -6930,6 +6929,12 @@ struct brcmf_cfg80211_info *brcmf_cfg802 - goto priv_out; - } - -+ err = brcmf_setup_wiphybands(wiphy); -+ if (err) { -+ brcmf_err("Setting wiphy bands failed (%d)\n", err); -+ goto wiphy_unreg_out; -+ } -+ - /* If cfg80211 didn't disable 40MHz HT CAP in wiphy_register(), - * setup 40MHz in 2GHz band and enable OBSS scanning. - */ |