Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad6c183 authored by Stijn Tintel's avatar Stijn Tintel Committed by Greg Kroah-Hartman
Browse files

brcmfmac: fix roamoff=1 modparam 



commit 8c892df41500469729e0d662816300196e4f463d upstream.

When the update_connect_param callback is set, nl80211 expects the flag
WIPHY_FLAG_SUPPORTS_FW_ROAM to be set as well. However, this flag is
only set when modparam roamoff=0, while the callback is set
unconditionally. Since commit 7f9a3e15 this causes a warning in
wiphy_register, which breaks brcmfmac.

Disable the update_connect_param callback when roamoff=0 to fix this.

Fixes: 7f9a3e15 ("nl80211: Update ERP info using NL80211_CMD_UPDATE_CONNECT_PARAMS")
Cc: Stable <stable@vger.kernel.org> # 4.19+
Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: default avatarStijn Tintel <stijn@linux-ipv6.be>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9eec74b4

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+9 −2
Original line number Diff line number Diff line
@@ -5188,10 +5188,17 @@ static struct cfg80211_ops brcmf_cfg80211_ops = { 
	.del_pmk = brcmf_cfg80211_del_pmk,

};



struct cfg80211_ops *brcmf_cfg80211_get_ops(void)

struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings)

{

	return kmemdup(&brcmf_cfg80211_ops, sizeof(brcmf_cfg80211_ops),

	struct cfg80211_ops *ops;



	ops = kmemdup(&brcmf_cfg80211_ops, sizeof(brcmf_cfg80211_ops),

		       GFP_KERNEL);



	if (ops && settings->roamoff)

		ops->update_connect_params = NULL;



	return ops;

}



struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr, 
void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg);

s32 brcmf_cfg80211_up(struct net_device *ndev);

s32 brcmf_cfg80211_down(struct net_device *ndev);

struct cfg80211_ops *brcmf_cfg80211_get_ops(void);

struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings);

enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);



struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) 


	brcmf_dbg(TRACE, "Enter\n");



	ops = brcmf_cfg80211_get_ops();

	ops = brcmf_cfg80211_get_ops(settings);

	if (!ops)

		return -ENOMEM;