mac80211: brcmfmac: backport 5.0 & 5.1 important changes/fixes

This backports the most important brcmfmac commits that:
1) Fix some bugs
2) Help debugging bugs

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit d32bbd747733de5daeb63a8f2c1307f612422f87)

1 files changed, 2223 insertions, 0 deletions

diff --git a/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch b/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch
new file mode 100644
index 0000000000..1694b42aa4
--- /dev/null
+++ b/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch
@@ -0,0 +1,2223 @@
+From 16e646768396339b3d354985b99bcd3f1f195a7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Fri, 15 Feb 2019 15:45:54 +0100
+Subject: [PATCH] brcmfmac: rework bphy_err() to take struct brcmf_pub argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This macro will be used in more places not just the cfg80211.c. It makes
+sense to pass some common struct to it as "struct wiphy" is mostly
+referenced in cfg80211 code only.
+
+A very common one (used above the bus abstraction layer) is struct
+brcmf_pub. Many functions already keep reference to it which will make
+using bphy_err() simpler. It should also allow extending that macro's
+logic if it's ever needed.
+
+This improves code recently added in the commit 3ef005b82e2a ("brcmfmac:
+add bphy_err() and use it in the cfg80211.c").
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 510 ++++++++++--------
+ .../broadcom/brcm80211/brcmfmac/debug.h       |   4 +-
+ 2 files changed, 281 insertions(+), 233 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+@@ -457,7 +457,7 @@ static void convert_key_from_CPU(struct
+ static int
+ send_key_to_dongle(struct brcmf_if *ifp, struct brcmf_wsec_key *key)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	int err;
+ 	struct brcmf_wsec_key_le key_le;
+ 
+@@ -469,7 +469,7 @@ send_key_to_dongle(struct brcmf_if *ifp,
+ 					sizeof(key_le));
+ 
+ 	if (err)
+-		bphy_err(wiphy, "wsec_key error (%d)\n", err);
++		bphy_err(drvr, "wsec_key error (%d)\n", err);
+ 	return err;
+ }
+ 
+@@ -550,7 +550,7 @@ static int brcmf_get_first_free_bsscfgid
+ 
+ static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_mbss_ssid_le mbss_ssid_le;
+ 	int bsscfgidx;
+ 	int err;
+@@ -567,7 +567,7 @@ static int brcmf_cfg80211_request_ap_if(
+ 	err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &mbss_ssid_le,
+ 					sizeof(mbss_ssid_le));
+ 	if (err < 0)
+-		bphy_err(wiphy, "setting ssid failed %d\n", err);
++		bphy_err(drvr, "setting ssid failed %d\n", err);
+ 
+ 	return err;
+ }
+@@ -586,6 +586,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_cfg80211_vif *vif;
+ 	int err;
+ 
+@@ -611,7 +612,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+ 					    BRCMF_VIF_EVENT_TIMEOUT);
+ 	brcmf_cfg80211_arm_vif_event(cfg, NULL);
+ 	if (!err) {
+-		bphy_err(wiphy, "timeout occurred\n");
++		bphy_err(drvr, "timeout occurred\n");
+ 		err = -EIO;
+ 		goto fail;
+ 	}
+@@ -619,7 +620,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+ 	/* interface created in firmware */
+ 	ifp = vif->ifp;
+ 	if (!ifp) {
+-		bphy_err(wiphy, "no if pointer provided\n");
++		bphy_err(drvr, "no if pointer provided\n");
+ 		err = -ENOENT;
+ 		goto fail;
+ 	}
+@@ -627,7 +628,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+ 	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
+ 	err = brcmf_net_attach(ifp, true);
+ 	if (err) {
+-		bphy_err(wiphy, "Registering netdevice failed\n");
++		bphy_err(drvr, "Registering netdevice failed\n");
+ 		goto fail;
+ 	}
+ 
+@@ -658,13 +659,15 @@ static struct wireless_dev *brcmf_cfg802
+ 						     u32 *flags,
+ 						     struct vif_params *params)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct wireless_dev *wdev;
+ 	int err;
+ 
+ 	brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
+ 	err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
+ 	if (err) {
+-		bphy_err(wiphy, "iface validation failed: err=%d\n", err);
++		bphy_err(drvr, "iface validation failed: err=%d\n", err);
+ 		return ERR_PTR(err);
+ 	}
+ 	switch (type) {
+@@ -689,7 +692,7 @@ static struct wireless_dev *brcmf_cfg802
+ 	}
+ 
+ 	if (IS_ERR(wdev))
+-		bphy_err(wiphy, "add iface %s type %d failed: err=%d\n", name,
++		bphy_err(drvr, "add iface %s type %d failed: err=%d\n", name,
+ 			 type, (int)PTR_ERR(wdev));
+ 	else
+ 		brcmf_cfg80211_update_proto_addr_mode(wdev);
+@@ -705,13 +708,13 @@ static void brcmf_scan_config_mpc(struct
+ 
+ void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err = 0;
+ 
+ 	if (check_vif_up(ifp->vif)) {
+ 		err = brcmf_fil_iovar_int_set(ifp, "mpc", mpc);
+ 		if (err) {
+-			bphy_err(wiphy, "fail to set mpc\n");
++			bphy_err(drvr, "fail to set mpc\n");
+ 			return;
+ 		}
+ 		brcmf_dbg(INFO, "MPC : %d\n", mpc);
+@@ -789,6 +792,7 @@ static int brcmf_cfg80211_del_ap_iface(s
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct net_device *ndev = wdev->netdev;
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	int ret;
+ 	int err;
+ 
+@@ -796,7 +800,7 @@ static int brcmf_cfg80211_del_ap_iface(s
+ 
+ 	err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
+ 	if (err) {
+-		bphy_err(wiphy, "interface_remove failed %d\n", err);
++		bphy_err(drvr, "interface_remove failed %d\n", err);
+ 		goto err_unarm;
+ 	}
+ 
+@@ -804,7 +808,7 @@ static int brcmf_cfg80211_del_ap_iface(s
+ 	ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
+ 					    BRCMF_VIF_EVENT_TIMEOUT);
+ 	if (!ret) {
+-		bphy_err(wiphy, "timeout occurred\n");
++		bphy_err(drvr, "timeout occurred\n");
+ 		err = -EIO;
+ 		goto err_unarm;
+ 	}
+@@ -867,6 +871,7 @@ brcmf_cfg80211_change_iface(struct wiphy
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_cfg80211_vif *vif = ifp->vif;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 infra = 0;
+ 	s32 ap = 0;
+ 	s32 err = 0;
+@@ -906,13 +911,13 @@ brcmf_cfg80211_change_iface(struct wiphy
+ 	}
+ 	err = brcmf_vif_change_validate(wiphy_to_cfg(wiphy), vif, type);
+ 	if (err) {
+-		bphy_err(wiphy, "iface validation failed: err=%d\n", err);
++		bphy_err(drvr, "iface validation failed: err=%d\n", err);
+ 		return err;
+ 	}
+ 	switch (type) {
+ 	case NL80211_IFTYPE_MONITOR:
+ 	case NL80211_IFTYPE_WDS:
+-		bphy_err(wiphy, "type (%d) : currently we do not support this type\n",
++		bphy_err(drvr, "type (%d) : currently we do not support this type\n",
+ 			 type);
+ 		return -EOPNOTSUPP;
+ 	case NL80211_IFTYPE_ADHOC:
+@@ -941,7 +946,7 @@ brcmf_cfg80211_change_iface(struct wiphy
+ 	} else {
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, infra);
+ 		if (err) {
+-			bphy_err(wiphy, "WLC_SET_INFRA error (%d)\n", err);
++			bphy_err(drvr, "WLC_SET_INFRA error (%d)\n", err);
+ 			err = -EAGAIN;
+ 			goto done;
+ 		}
+@@ -1043,7 +1048,7 @@ static s32
+ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
+ 		struct cfg80211_scan_request *request)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
+ 			  offsetof(struct brcmf_escan_params_le, params_le);
+ 	struct brcmf_escan_params_le *params;
+@@ -1075,7 +1080,7 @@ brcmf_run_escan(struct brcmf_cfg80211_in
+ 		if (err == -EBUSY)
+ 			brcmf_dbg(INFO, "system busy : escan canceled\n");
+ 		else
+-			bphy_err(wiphy, "error (%d)\n", err);
++			bphy_err(drvr, "error (%d)\n", err);
+ 	}
+ 
+ 	kfree(params);
+@@ -1122,6 +1127,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy
+ {
+ 	struct brcmf_if *ifp = vif->ifp;
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct cfg80211_ssid *ssids;
+ 	u32 passive_scan;
+ 	bool escan_req;
+@@ -1133,22 +1139,22 @@ brcmf_cfg80211_escan(struct wiphy *wiphy
+ 	brcmf_dbg(SCAN, "START ESCAN\n");
+ 
+ 	if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
+-		bphy_err(wiphy, "Scanning already: status (%lu)\n",
++		bphy_err(drvr, "Scanning already: status (%lu)\n",
+ 			 cfg->scan_status);
+ 		return -EAGAIN;
+ 	}
+ 	if (test_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status)) {
+-		bphy_err(wiphy, "Scanning being aborted: status (%lu)\n",
++		bphy_err(drvr, "Scanning being aborted: status (%lu)\n",
+ 			 cfg->scan_status);
+ 		return -EAGAIN;
+ 	}
+ 	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
+-		bphy_err(wiphy, "Scanning suppressed: status (%lu)\n",
++		bphy_err(drvr, "Scanning suppressed: status (%lu)\n",
+ 			 cfg->scan_status);
+ 		return -EAGAIN;
+ 	}
+ 	if (test_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state)) {
+-		bphy_err(wiphy, "Connecting: status (%lu)\n",
++		bphy_err(drvr, "Connecting: status (%lu)\n",
+ 			 ifp->vif->sme_state);
+ 		return -EAGAIN;
+ 	}
+@@ -1230,6 +1236,8 @@ scan_out:
+ static s32
+ brcmf_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request)
+ {
++ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_cfg80211_vif *vif;
+ 	s32 err = 0;
+ 
+@@ -1241,7 +1249,7 @@ brcmf_cfg80211_scan(struct wiphy *wiphy,
+ 	err = brcmf_cfg80211_escan(wiphy, vif, request, NULL);
+ 
+ 	if (err)
+-		bphy_err(wiphy, "scan error (%d)\n", err);
++		bphy_err(drvr, "scan error (%d)\n", err);
+ 
+ 	brcmf_dbg(TRACE, "Exit\n");
+ 	return err;
+@@ -1250,12 +1258,12 @@ brcmf_cfg80211_scan(struct wiphy *wiphy,
+ static s32 brcmf_set_rts(struct net_device *ndev, u32 rts_threshold)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err = 0;
+ 
+ 	err = brcmf_fil_iovar_int_set(ifp, "rtsthresh", rts_threshold);
+ 	if (err)
+-		bphy_err(wiphy, "Error (%d)\n", err);
++		bphy_err(drvr, "Error (%d)\n", err);
+ 
+ 	return err;
+ }
+@@ -1263,13 +1271,13 @@ static s32 brcmf_set_rts(struct net_devi
+ static s32 brcmf_set_frag(struct net_device *ndev, u32 frag_threshold)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err = 0;
+ 
+ 	err = brcmf_fil_iovar_int_set(ifp, "fragthresh",
+ 				      frag_threshold);
+ 	if (err)
+-		bphy_err(wiphy, "Error (%d)\n", err);
++		bphy_err(drvr, "Error (%d)\n", err);
+ 
+ 	return err;
+ }
+@@ -1277,13 +1285,13 @@ static s32 brcmf_set_frag(struct net_dev
+ static s32 brcmf_set_retry(struct net_device *ndev, u32 retry, bool l)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err = 0;
+ 	u32 cmd = (l ? BRCMF_C_SET_LRL : BRCMF_C_SET_SRL);
+ 
+ 	err = brcmf_fil_cmd_int_set(ifp, cmd, retry);
+ 	if (err) {
+-		bphy_err(wiphy, "cmd (%d) , error (%d)\n", cmd, err);
++		bphy_err(drvr, "cmd (%d) , error (%d)\n", cmd, err);
+ 		return err;
+ 	}
+ 	return err;
+@@ -1360,7 +1368,7 @@ static u16 brcmf_map_fw_linkdown_reason(
+ static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(vif->wdev.wiphy);
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err = 0;
+ 
+ 	brcmf_dbg(TRACE, "Enter\n");
+@@ -1370,7 +1378,7 @@ static void brcmf_link_down(struct brcmf
+ 		err = brcmf_fil_cmd_data_set(vif->ifp,
+ 					     BRCMF_C_DISASSOC, NULL, 0);
+ 		if (err) {
+-			bphy_err(wiphy, "WLC_DISASSOC failed (%d)\n", err);
++			bphy_err(drvr, "WLC_DISASSOC failed (%d)\n", err);
+ 		}
+ 		if ((vif->wdev.iftype == NL80211_IFTYPE_STATION) ||
+ 		    (vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT))
+@@ -1390,6 +1398,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *w
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_join_params join_params;
+ 	size_t join_params_size = 0;
+ 	s32 err = 0;
+@@ -1454,7 +1463,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *w
+ 
+ 	err = brcmf_fil_iovar_int_set(ifp, "wsec", wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "wsec failed (%d)\n", err);
++		bphy_err(drvr, "wsec failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -1466,7 +1475,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *w
+ 
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD, bcnprd);
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_SET_BCNPRD failed (%d)\n", err);
++		bphy_err(drvr, "WLC_SET_BCNPRD failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -1511,7 +1520,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *w
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_CHANNEL,
+ 					    target_channel);
+ 		if (err) {
+-			bphy_err(wiphy, "WLC_SET_CHANNEL failed (%d)\n", err);
++			bphy_err(drvr, "WLC_SET_CHANNEL failed (%d)\n", err);
+ 			goto done;
+ 		}
+ 	} else
+@@ -1523,7 +1532,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *w
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
+ 				     &join_params, join_params_size);
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_SET_SSID failed (%d)\n", err);
++		bphy_err(drvr, "WLC_SET_SSID failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -1560,8 +1569,8 @@ static s32 brcmf_set_wpa_version(struct
+ 				 struct cfg80211_connect_params *sme)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
+ 	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_cfg80211_security *sec;
+ 	s32 val = 0;
+ 	s32 err = 0;
+@@ -1575,7 +1584,7 @@ static s32 brcmf_set_wpa_version(struct
+ 	brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", val);
+ 	if (err) {
+-		bphy_err(wiphy, "set wpa_auth failed (%d)\n", err);
++		bphy_err(drvr, "set wpa_auth failed (%d)\n", err);
+ 		return err;
+ 	}
+ 	sec = &profile->sec;
+@@ -1587,8 +1596,8 @@ static s32 brcmf_set_auth_type(struct ne
+ 			       struct cfg80211_connect_params *sme)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
+ 	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_cfg80211_security *sec;
+ 	s32 val = 0;
+ 	s32 err = 0;
+@@ -1610,7 +1619,7 @@ static s32 brcmf_set_auth_type(struct ne
+ 
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
+ 	if (err) {
+-		bphy_err(wiphy, "set auth failed (%d)\n", err);
++		bphy_err(drvr, "set auth failed (%d)\n", err);
+ 		return err;
+ 	}
+ 	sec = &profile->sec;
+@@ -1623,8 +1632,8 @@ brcmf_set_wsec_mode(struct net_device *n
+ 		    struct cfg80211_connect_params *sme)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
+ 	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_cfg80211_security *sec;
+ 	s32 pval = 0;
+ 	s32 gval = 0;
+@@ -1647,7 +1656,7 @@ brcmf_set_wsec_mode(struct net_device *n
+ 			pval = AES_ENABLED;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "invalid cipher pairwise (%d)\n",
++			bphy_err(drvr, "invalid cipher pairwise (%d)\n",
+ 				 sme->crypto.ciphers_pairwise[0]);
+ 			return -EINVAL;
+ 		}
+@@ -1668,7 +1677,7 @@ brcmf_set_wsec_mode(struct net_device *n
+ 			gval = AES_ENABLED;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "invalid cipher group (%d)\n",
++			bphy_err(drvr, "invalid cipher group (%d)\n",
+ 				 sme->crypto.cipher_group);
+ 			return -EINVAL;
+ 		}
+@@ -1684,7 +1693,7 @@ brcmf_set_wsec_mode(struct net_device *n
+ 	wsec = pval | gval;
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "error (%d)\n", err);
++		bphy_err(drvr, "error (%d)\n", err);
+ 		return err;
+ 	}
+ 
+@@ -1699,7 +1708,7 @@ static s32
+ brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 val;
+ 	s32 err;
+ 	const struct brcmf_tlv *rsn_ie;
+@@ -1715,7 +1724,7 @@ brcmf_set_key_mgmt(struct net_device *nd
+ 
+ 	err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &val);
+ 	if (err) {
+-		bphy_err(wiphy, "could not get wpa_auth (%d)\n", err);
++		bphy_err(drvr, "could not get wpa_auth (%d)\n", err);
+ 		return err;
+ 	}
+ 	if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
+@@ -1727,7 +1736,7 @@ brcmf_set_key_mgmt(struct net_device *nd
+ 			val = WPA_AUTH_PSK;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "invalid cipher group (%d)\n",
++			bphy_err(drvr, "invalid cipher group (%d)\n",
+ 				 sme->crypto.cipher_group);
+ 			return -EINVAL;
+ 		}
+@@ -1746,7 +1755,7 @@ brcmf_set_key_mgmt(struct net_device *nd
+ 			val = WPA2_AUTH_PSK;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "invalid cipher group (%d)\n",
++			bphy_err(drvr, "invalid cipher group (%d)\n",
+ 				 sme->crypto.cipher_group);
+ 			return -EINVAL;
+ 		}
+@@ -1790,7 +1799,7 @@ skip_mfp_config:
+ 	brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
+ 	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
+ 	if (err) {
+-		bphy_err(wiphy, "could not set wpa_auth (%d)\n", err);
++		bphy_err(drvr, "could not set wpa_auth (%d)\n", err);
+ 		return err;
+ 	}
+ 
+@@ -1802,7 +1811,7 @@ brcmf_set_sharedkey(struct net_device *n
+ 		    struct cfg80211_connect_params *sme)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
+ 	struct brcmf_cfg80211_security *sec;
+ 	struct brcmf_wsec_key key;
+@@ -1829,7 +1838,7 @@ brcmf_set_sharedkey(struct net_device *n
+ 	key.len = (u32) sme->key_len;
+ 	key.index = (u32) sme->key_idx;
+ 	if (key.len > sizeof(key.data)) {
+-		bphy_err(wiphy, "Too long key length (%u)\n", key.len);
++		bphy_err(drvr, "Too long key length (%u)\n", key.len);
+ 		return -EINVAL;
+ 	}
+ 	memcpy(key.data, sme->key, key.len);
+@@ -1842,7 +1851,7 @@ brcmf_set_sharedkey(struct net_device *n
+ 		key.algo = CRYPTO_ALGO_WEP128;
+ 		break;
+ 	default:
+-		bphy_err(wiphy, "Invalid algorithm (%d)\n",
++		bphy_err(drvr, "Invalid algorithm (%d)\n",
+ 			 sme->crypto.ciphers_pairwise[0]);
+ 		return -EINVAL;
+ 	}
+@@ -1859,7 +1868,7 @@ brcmf_set_sharedkey(struct net_device *n
+ 		val = WL_AUTH_SHARED_KEY;	/* shared key */
+ 		err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
+ 		if (err)
+-			bphy_err(wiphy, "set auth failed (%d)\n", err);
++			bphy_err(drvr, "set auth failed (%d)\n", err);
+ 	}
+ 	return err;
+ }
+@@ -1879,7 +1888,7 @@ enum nl80211_auth_type brcmf_war_auth_ty
+ static void brcmf_set_join_pref(struct brcmf_if *ifp,
+ 				struct cfg80211_bss_selection *bss_select)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_join_pref_params join_pref_params[2];
+ 	enum nl80211_band band;
+ 	int err, i = 0;
+@@ -1918,7 +1927,7 @@ static void brcmf_set_join_pref(struct b
+ 	err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
+ 				       sizeof(join_pref_params));
+ 	if (err)
+-		bphy_err(wiphy, "Set join_pref error (%d)\n", err);
++		bphy_err(drvr, "Set join_pref error (%d)\n", err);
+ }
+ 
+ static s32
+@@ -1928,6 +1937,7 @@ brcmf_cfg80211_connect(struct wiphy *wip
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct ieee80211_channel *chan = sme->channel;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_join_params join_params;
+ 	size_t join_params_size;
+ 	const struct brcmf_tlv *rsn_ie;
+@@ -1944,7 +1954,7 @@ brcmf_cfg80211_connect(struct wiphy *wip
+ 		return -EIO;
+ 
+ 	if (!sme->ssid) {
+-		bphy_err(wiphy, "Invalid ssid\n");
++		bphy_err(drvr, "Invalid ssid\n");
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+@@ -1973,7 +1983,7 @@ brcmf_cfg80211_connect(struct wiphy *wip
+ 	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
+ 				    sme->ie, sme->ie_len);
+ 	if (err)
+-		bphy_err(wiphy, "Set Assoc REQ IE Failed\n");
++		bphy_err(drvr, "Set Assoc REQ IE Failed\n");
+ 	else
+ 		brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
+ 
+@@ -1994,32 +2004,32 @@ brcmf_cfg80211_connect(struct wiphy *wip
+ 
+ 	err = brcmf_set_wpa_version(ndev, sme);
+ 	if (err) {
+-		bphy_err(wiphy, "wl_set_wpa_version failed (%d)\n", err);
++		bphy_err(drvr, "wl_set_wpa_version failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+ 	sme->auth_type = brcmf_war_auth_type(ifp, sme->auth_type);
+ 	err = brcmf_set_auth_type(ndev, sme);
+ 	if (err) {
+-		bphy_err(wiphy, "wl_set_auth_type failed (%d)\n", err);
++		bphy_err(drvr, "wl_set_auth_type failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+ 	err = brcmf_set_wsec_mode(ndev, sme);
+ 	if (err) {
+-		bphy_err(wiphy, "wl_set_set_cipher failed (%d)\n", err);
++		bphy_err(drvr, "wl_set_set_cipher failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+ 	err = brcmf_set_key_mgmt(ndev, sme);
+ 	if (err) {
+-		bphy_err(wiphy, "wl_set_key_mgmt failed (%d)\n", err);
++		bphy_err(drvr, "wl_set_key_mgmt failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+ 	err = brcmf_set_sharedkey(ndev, sme);
+ 	if (err) {
+-		bphy_err(wiphy, "brcmf_set_sharedkey failed (%d)\n", err);
++		bphy_err(drvr, "brcmf_set_sharedkey failed (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -2106,7 +2116,7 @@ brcmf_cfg80211_connect(struct wiphy *wip
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
+ 				     &join_params, join_params_size);
+ 	if (err)
+-		bphy_err(wiphy, "BRCMF_C_SET_SSID failed (%d)\n", err);
++		bphy_err(drvr, "BRCMF_C_SET_SSID failed (%d)\n", err);
+ 
+ done:
+ 	if (err)
+@@ -2119,8 +2129,10 @@ static s32
+ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
+ 		       u16 reason_code)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_scb_val_le scbval;
+ 	s32 err = 0;
+ 
+@@ -2137,7 +2149,7 @@ brcmf_cfg80211_disconnect(struct wiphy *
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_DISASSOC,
+ 				     &scbval, sizeof(scbval));
+ 	if (err)
+-		bphy_err(wiphy, "error (%d)\n", err);
++		bphy_err(drvr, "error (%d)\n", err);
+ 
+ 	brcmf_dbg(TRACE, "Exit\n");
+ 	return err;
+@@ -2150,6 +2162,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct net_device *ndev = cfg_to_ndev(cfg);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 	s32 disable;
+ 	u32 qdbm = 127;
+@@ -2164,7 +2177,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy
+ 	case NL80211_TX_POWER_LIMITED:
+ 	case NL80211_TX_POWER_FIXED:
+ 		if (mbm < 0) {
+-			bphy_err(wiphy, "TX_POWER_FIXED - dbm is negative\n");
++			bphy_err(drvr, "TX_POWER_FIXED - dbm is negative\n");
+ 			err = -EINVAL;
+ 			goto done;
+ 		}
+@@ -2174,7 +2187,7 @@ brcmf_cfg80211_set_tx_power(struct wiphy
+ 		qdbm |= WL_TXPWR_OVERRIDE;
+ 		break;
+ 	default:
+-		bphy_err(wiphy, "Unsupported type %d\n", type);
++		bphy_err(drvr, "Unsupported type %d\n", type);
+ 		err = -EINVAL;
+ 		goto done;
+ 	}
+@@ -2182,11 +2195,11 @@ brcmf_cfg80211_set_tx_power(struct wiphy
+ 	disable = WL_RADIO_SW_DISABLE << 16;
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_RADIO, disable);
+ 	if (err)
+-		bphy_err(wiphy, "WLC_SET_RADIO error (%d)\n", err);
++		bphy_err(drvr, "WLC_SET_RADIO error (%d)\n", err);
+ 
+ 	err = brcmf_fil_iovar_int_set(ifp, "qtxpower", qdbm);
+ 	if (err)
+-		bphy_err(wiphy, "qtxpower error (%d)\n", err);
++		bphy_err(drvr, "qtxpower error (%d)\n", err);
+ 
+ done:
+ 	brcmf_dbg(TRACE, "Exit %d (qdbm)\n", qdbm & ~WL_TXPWR_OVERRIDE);
+@@ -2197,7 +2210,9 @@ static s32
+ brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+ 			    s32 *dbm)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_cfg80211_vif *vif = wdev_to_vif(wdev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 qdbm = 0;
+ 	s32 err;
+ 
+@@ -2207,7 +2222,7 @@ brcmf_cfg80211_get_tx_power(struct wiphy
+ 
+ 	err = brcmf_fil_iovar_int_get(vif->ifp, "qtxpower", &qdbm);
+ 	if (err) {
+-		bphy_err(wiphy, "error (%d)\n", err);
++		bphy_err(drvr, "error (%d)\n", err);
+ 		goto done;
+ 	}
+ 	*dbm = (qdbm & ~WL_TXPWR_OVERRIDE) / 4;
+@@ -2222,6 +2237,7 @@ brcmf_cfg80211_config_default_key(struct
+ 				  u8 key_idx, bool unicast, bool multicast)
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	u32 index;
+ 	u32 wsec;
+ 	s32 err = 0;
+@@ -2233,7 +2249,7 @@ brcmf_cfg80211_config_default_key(struct
+ 
+ 	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_GET_WSEC error (%d)\n", err);
++		bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -2243,7 +2259,7 @@ brcmf_cfg80211_config_default_key(struct
+ 		err = brcmf_fil_cmd_int_set(ifp,
+ 					    BRCMF_C_SET_KEY_PRIMARY, index);
+ 		if (err)
+-			bphy_err(wiphy, "error (%d)\n", err);
++			bphy_err(drvr, "error (%d)\n", err);
+ 	}
+ done:
+ 	brcmf_dbg(TRACE, "Exit\n");
+@@ -2292,7 +2308,9 @@ brcmf_cfg80211_add_key(struct wiphy *wip
+ 		       u8 key_idx, bool pairwise, const u8 *mac_addr,
+ 		       struct key_params *params)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_wsec_key *key;
+ 	s32 val;
+ 	s32 wsec;
+@@ -2307,7 +2325,7 @@ brcmf_cfg80211_add_key(struct wiphy *wip
+ 
+ 	if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
+ 		/* we ignore this key index in this case */
+-		bphy_err(wiphy, "invalid key index (%d)\n", key_idx);
++		bphy_err(drvr, "invalid key index (%d)\n", key_idx);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -2316,7 +2334,7 @@ brcmf_cfg80211_add_key(struct wiphy *wip
+ 					      mac_addr);
+ 
+ 	if (params->key_len > sizeof(key->data)) {
+-		bphy_err(wiphy, "Too long key length (%u)\n", params->key_len);
++		bphy_err(drvr, "Too long key length (%u)\n", params->key_len);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -2370,7 +2388,7 @@ brcmf_cfg80211_add_key(struct wiphy *wip
+ 		brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_CCMP\n");
+ 		break;
+ 	default:
+-		bphy_err(wiphy, "Invalid cipher (0x%x)\n", params->cipher);
++		bphy_err(drvr, "Invalid cipher (0x%x)\n", params->cipher);
+ 		err = -EINVAL;
+ 		goto done;
+ 	}
+@@ -2381,13 +2399,13 @@ brcmf_cfg80211_add_key(struct wiphy *wip
+ 
+ 	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "get wsec error (%d)\n", err);
++		bphy_err(drvr, "get wsec error (%d)\n", err);
+ 		goto done;
+ 	}
+ 	wsec |= val;
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "set wsec error (%d)\n", err);
++		bphy_err(drvr, "set wsec error (%d)\n", err);
+ 		goto done;
+ 	}
+ 
+@@ -2402,9 +2420,11 @@ brcmf_cfg80211_get_key(struct wiphy *wip
+ 		       void (*callback)(void *cookie,
+ 					struct key_params *params))
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct key_params params;
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_cfg80211_security *sec;
+ 	s32 wsec;
+ 	s32 err = 0;
+@@ -2418,7 +2438,7 @@ brcmf_cfg80211_get_key(struct wiphy *wip
+ 
+ 	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_GET_WSEC error (%d)\n", err);
++		bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
+ 		/* Ignore this error, may happen during DISASSOC */
+ 		err = -EAGAIN;
+ 		goto done;
+@@ -2439,7 +2459,7 @@ brcmf_cfg80211_get_key(struct wiphy *wip
+ 		params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
+ 		brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
+ 	} else  {
+-		bphy_err(wiphy, "Invalid algo (0x%x)\n", wsec);
++		bphy_err(drvr, "Invalid algo (0x%x)\n", wsec);
+ 		err = -EINVAL;
+ 		goto done;
+ 	}
+@@ -2469,7 +2489,7 @@ brcmf_cfg80211_config_default_mgmt_key(s
+ static void
+ brcmf_cfg80211_reconfigure_wep(struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err;
+ 	u8 key_idx;
+ 	struct brcmf_wsec_key *key;
+@@ -2486,18 +2506,18 @@ brcmf_cfg80211_reconfigure_wep(struct br
+ 
+ 	err = send_key_to_dongle(ifp, key);
+ 	if (err) {
+-		bphy_err(wiphy, "Setting WEP key failed (%d)\n", err);
++		bphy_err(drvr, "Setting WEP key failed (%d)\n", err);
+ 		return;
+ 	}
+ 	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
+ 	if (err) {
+-		bphy_err(wiphy, "get wsec error (%d)\n", err);
++		bphy_err(drvr, "get wsec error (%d)\n", err);
+ 		return;
+ 	}
+ 	wsec |= WEP_ENABLED;
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
+ 	if (err)
+-		bphy_err(wiphy, "set wsec error (%d)\n", err);
++		bphy_err(drvr, "set wsec error (%d)\n", err);
+ }
+ 
+ static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si)
+@@ -2523,7 +2543,7 @@ static void brcmf_convert_sta_flags(u32
+ 
+ static void brcmf_fill_bss_param(struct brcmf_if *ifp, struct station_info *si)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct {
+ 		__le32 len;
+ 		struct brcmf_bss_info_le bss_le;
+@@ -2539,7 +2559,7 @@ static void brcmf_fill_bss_param(struct
+ 	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO, buf,
+ 				     WL_BSS_INFO_MAX);
+ 	if (err) {
+-		bphy_err(wiphy, "Failed to get bss info (%d)\n", err);
++		bphy_err(drvr, "Failed to get bss info (%d)\n", err);
+ 		goto out_kfree;
+ 	}
+ 	si->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);
+@@ -2561,7 +2581,7 @@ static s32
+ brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
+ 				struct station_info *sinfo)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	struct brcmf_scb_val_le scbval;
+ 	struct brcmf_pktcnt_le pktcnt;
+ 	s32 err;
+@@ -2571,7 +2591,7 @@ brcmf_cfg80211_get_station_ibss(struct b
+ 	/* Get the current tx rate */
+ 	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_RATE, &rate);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "BRCMF_C_GET_RATE error (%d)\n", err);
++		bphy_err(drvr, "BRCMF_C_GET_RATE error (%d)\n", err);
+ 		return err;
+ 	}
+ 	sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);
+@@ -2581,7 +2601,7 @@ brcmf_cfg80211_get_station_ibss(struct b
+ 	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI, &scbval,
+ 				     sizeof(scbval));
+ 	if (err) {
+-		bphy_err(wiphy, "BRCMF_C_GET_RSSI error (%d)\n", err);
++		bphy_err(drvr, "BRCMF_C_GET_RSSI error (%d)\n", err);
+ 		return err;
+ 	}
+ 	rssi = le32_to_cpu(scbval.val);
+@@ -2591,7 +2611,7 @@ brcmf_cfg80211_get_station_ibss(struct b
+ 	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt,
+ 				     sizeof(pktcnt));
+ 	if (err) {
+-		bphy_err(wiphy, "BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
++		bphy_err(drvr, "BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
+ 		return err;
+ 	}
+ 	sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS) |
+@@ -2610,7 +2630,9 @@ static s32
+ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev,
+ 			   const u8 *mac, struct station_info *sinfo)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_scb_val_le scb_val;
+ 	s32 err = 0;
+ 	struct brcmf_sta_info_le sta_info_le;
+@@ -2639,7 +2661,7 @@ brcmf_cfg80211_get_station(struct wiphy
+ 					       &sta_info_le,
+ 					       sizeof(sta_info_le));
+ 		if (err < 0) {
+-			bphy_err(wiphy, "GET STA INFO failed, %d\n", err);
++			bphy_err(drvr, "GET STA INFO failed, %d\n", err);
+ 			goto done;
+ 		}
+ 	}
+@@ -2708,7 +2730,7 @@ brcmf_cfg80211_get_station(struct wiphy
+ 			err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI,
+ 						     &scb_val, sizeof(scb_val));
+ 			if (err) {
+-				bphy_err(wiphy, "Could not get rssi (%d)\n",
++				bphy_err(drvr, "Could not get rssi (%d)\n",
+ 					 err);
+ 				goto done;
+ 			} else {
+@@ -2730,6 +2752,7 @@ brcmf_cfg80211_dump_station(struct wiphy
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 
+ 	brcmf_dbg(TRACE, "Enter, idx %d\n", idx);
+@@ -2740,7 +2763,7 @@ brcmf_cfg80211_dump_station(struct wiphy
+ 					     &cfg->assoclist,
+ 					     sizeof(cfg->assoclist));
+ 		if (err) {
+-			bphy_err(wiphy, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
++			bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
+ 				 err);
+ 			cfg->assoclist.count = 0;
+ 			return -EOPNOTSUPP;
+@@ -2761,6 +2784,7 @@ brcmf_cfg80211_set_power_mgmt(struct wip
+ 	s32 err = 0;
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 
+ 	brcmf_dbg(TRACE, "Enter\n");
+ 
+@@ -2789,9 +2813,9 @@ brcmf_cfg80211_set_power_mgmt(struct wip
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
+ 	if (err) {
+ 		if (err == -ENODEV)
+-			bphy_err(wiphy, "net_device is not ready yet\n");
++			bphy_err(drvr, "net_device is not ready yet\n");
+ 		else
+-			bphy_err(wiphy, "error (%d)\n", err);
++			bphy_err(drvr, "error (%d)\n", err);
+ 	}
+ done:
+ 	brcmf_dbg(TRACE, "Exit\n");
+@@ -2802,6 +2826,7 @@ static s32 brcmf_inform_single_bss(struc
+ 				   struct brcmf_bss_info_le *bi)
+ {
+ 	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct ieee80211_channel *notify_channel;
+ 	struct cfg80211_bss *bss;
+ 	struct ieee80211_supported_band *band;
+@@ -2815,7 +2840,7 @@ static s32 brcmf_inform_single_bss(struc
+ 	s32 notify_signal;
+ 
+ 	if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {
+-		bphy_err(wiphy, "Bss info is larger than buffer. Discarding\n");
++		bphy_err(drvr, "Bss info is larger than buffer. Discarding\n");
+ 		return 0;
+ 	}
+ 
+@@ -2873,7 +2898,7 @@ next_bss_le(struct brcmf_scan_results *l
+ 
+ static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_scan_results *bss_list;
+ 	struct brcmf_bss_info_le *bi = NULL;	/* must be initialized */
+ 	s32 err = 0;
+@@ -2882,7 +2907,7 @@ static s32 brcmf_inform_bss(struct brcmf
+ 	bss_list = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
+ 	if (bss_list->count != 0 &&
+ 	    bss_list->version != BRCMF_BSS_INFO_VERSION) {
+-		bphy_err(wiphy, "Version %d != WL_BSS_INFO_VERSION\n",
++		bphy_err(drvr, "Version %d != WL_BSS_INFO_VERSION\n",
+ 			 bss_list->version);
+ 		return -EOPNOTSUPP;
+ 	}
+@@ -2900,6 +2925,7 @@ static s32 brcmf_inform_ibss(struct brcm
+ 			     struct net_device *ndev, const u8 *bssid)
+ {
+ 	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct ieee80211_channel *notify_channel;
+ 	struct brcmf_bss_info_le *bi = NULL;
+ 	struct ieee80211_supported_band *band;
+@@ -2927,7 +2953,7 @@ static s32 brcmf_inform_ibss(struct brcm
+ 	err = brcmf_fil_cmd_data_get(netdev_priv(ndev), BRCMF_C_GET_BSS_INFO,
+ 				     buf, WL_BSS_INFO_MAX);
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_GET_BSS_INFO failed: %d\n", err);
++		bphy_err(drvr, "WLC_GET_BSS_INFO failed: %d\n", err);
+ 		goto CleanUp;
+ 	}
+ 
+@@ -2981,7 +3007,7 @@ CleanUp:
+ static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
+ 				 struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_bss_info_le *bi;
+ 	const struct brcmf_tlv *tim;
+ 	u16 beacon_interval;
+@@ -2998,7 +3024,7 @@ static s32 brcmf_update_bss_info(struct
+ 	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO,
+ 				     cfg->extra_buf, WL_EXTRA_BUF_MAX);
+ 	if (err) {
+-		bphy_err(wiphy, "Could not get bss info %d\n", err);
++		bphy_err(drvr, "Could not get bss info %d\n", err);
+ 		goto update_bss_info_out;
+ 	}
+ 
+@@ -3023,7 +3049,7 @@ static s32 brcmf_update_bss_info(struct
+ 		u32 var;
+ 		err = brcmf_fil_iovar_int_get(ifp, "dtim_assoc", &var);
+ 		if (err) {
+-			bphy_err(wiphy, "wl dtim_assoc failed (%d)\n", err);
++			bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
+ 			goto update_bss_info_out;
+ 		}
+ 		dtim_period = (u8)var;
+@@ -3061,10 +3087,10 @@ static void brcmf_escan_timeout(unsigned
+ {
+ 	struct brcmf_cfg80211_info *cfg =
+ 			(struct brcmf_cfg80211_info *)data;
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 
+ 	if (cfg->internal_escan || cfg->scan_request) {
+-		bphy_err(wiphy, "timer expired\n");
++		bphy_err(drvr, "timer expired\n");
+ 		schedule_work(&cfg->escan_timeout_work);
+ 	}
+ }
+@@ -3112,8 +3138,8 @@ static s32
+ brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
+ 			     const struct brcmf_event_msg *e, void *data)
+ {
+-	struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = ifp->drvr;
++	struct brcmf_cfg80211_info *cfg = drvr->config;
+ 	s32 status;
+ 	struct brcmf_escan_result_le *escan_result_le;
+ 	u32 escan_buflen;
+@@ -3130,7 +3156,7 @@ brcmf_cfg80211_escan_handler(struct brcm
+ 		goto exit;
+ 
+ 	if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
+-		bphy_err(wiphy, "scan not ready, bsscfgidx=%d\n",
++		bphy_err(drvr, "scan not ready, bsscfgidx=%d\n",
+ 			 ifp->bsscfgidx);
+ 		return -EPERM;
+ 	}
+@@ -3138,24 +3164,24 @@ brcmf_cfg80211_escan_handler(struct brcm
+ 	if (status == BRCMF_E_STATUS_PARTIAL) {
+ 		brcmf_dbg(SCAN, "ESCAN Partial result\n");
+ 		if (e->datalen < sizeof(*escan_result_le)) {
+-			bphy_err(wiphy, "invalid event data length\n");
++			bphy_err(drvr, "invalid event data length\n");
+ 			goto exit;
+ 		}
+ 		escan_result_le = (struct brcmf_escan_result_le *) data;
+ 		if (!escan_result_le) {
+-			bphy_err(wiphy, "Invalid escan result (NULL pointer)\n");
++			bphy_err(drvr, "Invalid escan result (NULL pointer)\n");
+ 			goto exit;
+ 		}
+ 		escan_buflen = le32_to_cpu(escan_result_le->buflen);
+ 		if (escan_buflen > BRCMF_ESCAN_BUF_SIZE ||
+ 		    escan_buflen > e->datalen ||
+ 		    escan_buflen < sizeof(*escan_result_le)) {
+-			bphy_err(wiphy, "Invalid escan buffer length: %d\n",
++			bphy_err(drvr, "Invalid escan buffer length: %d\n",
+ 				 escan_buflen);
+ 			goto exit;
+ 		}
+ 		if (le16_to_cpu(escan_result_le->bss_count) != 1) {
+-			bphy_err(wiphy, "Invalid bss_count %d: ignoring\n",
++			bphy_err(drvr, "Invalid bss_count %d: ignoring\n",
+ 				 escan_result_le->bss_count);
+ 			goto exit;
+ 		}
+@@ -3171,7 +3197,7 @@ brcmf_cfg80211_escan_handler(struct brcm
+ 
+ 		bi_length = le32_to_cpu(bss_info_le->length);
+ 		if (bi_length != escan_buflen -	WL_ESCAN_RESULTS_FIXED_SIZE) {
+-			bphy_err(wiphy, "Ignoring invalid bss_info length: %d\n",
++			bphy_err(drvr, "Ignoring invalid bss_info length: %d\n",
+ 				 bi_length);
+ 			goto exit;
+ 		}
+@@ -3180,7 +3206,7 @@ brcmf_cfg80211_escan_handler(struct brcm
+ 					BIT(NL80211_IFTYPE_ADHOC))) {
+ 			if (le16_to_cpu(bss_info_le->capability) &
+ 						WLAN_CAPABILITY_IBSS) {
+-				bphy_err(wiphy, "Ignoring IBSS result\n");
++				bphy_err(drvr, "Ignoring IBSS result\n");
+ 				goto exit;
+ 			}
+ 		}
+@@ -3188,7 +3214,7 @@ brcmf_cfg80211_escan_handler(struct brcm
+ 		list = (struct brcmf_scan_results *)
+ 				cfg->escan_info.escan_buf;
+ 		if (bi_length > BRCMF_ESCAN_BUF_SIZE - list->buflen) {
+-			bphy_err(wiphy, "Buffer is too small: ignoring\n");
++			bphy_err(drvr, "Buffer is too small: ignoring\n");
+ 			goto exit;
+ 		}
+ 
+@@ -3345,7 +3371,8 @@ static s32
+ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
+ 				const struct brcmf_event_msg *e, void *data)
+ {
+-	struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
++	struct brcmf_pub *drvr = ifp->drvr;
++	struct brcmf_cfg80211_info *cfg = drvr->config;
+ 	struct brcmf_pno_net_info_le *netinfo, *netinfo_start;
+ 	struct cfg80211_scan_request *request = NULL;
+ 	struct wiphy *wiphy = cfg_to_wiphy(cfg);
+@@ -3377,14 +3404,14 @@ brcmf_notify_sched_scan_results(struct b
+ 	WARN_ON(status != BRCMF_PNO_SCAN_COMPLETE);
+ 	brcmf_dbg(SCAN, "PFN NET FOUND event. count: %d\n", result_count);
+ 	if (!result_count) {
+-		bphy_err(wiphy, "FALSE PNO Event. (pfn_count == 0)\n");
++		bphy_err(drvr, "FALSE PNO Event. (pfn_count == 0)\n");
+ 		goto out_err;
+ 	}
+ 
+ 	netinfo_start = brcmf_get_netinfo_array(pfn_result);
+ 	datalen = e->datalen - ((void *)netinfo_start - (void *)pfn_result);
+ 	if (datalen < result_count * sizeof(*netinfo)) {
+-		bphy_err(wiphy, "insufficient event data\n");
++		bphy_err(drvr, "insufficient event data\n");
+ 		goto out_err;
+ 	}
+ 
+@@ -3428,12 +3455,13 @@ brcmf_cfg80211_sched_scan_start(struct w
+ {
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 
+ 	brcmf_dbg(SCAN, "Enter n_match_sets:%d n_ssids:%d\n",
+ 		  req->n_match_sets, req->n_ssids);
+ 
+ 	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
+-		bphy_err(wiphy, "Scanning suppressed: status (%lu)\n",
++		bphy_err(drvr, "Scanning suppressed: status (%lu)\n",
+ 			 cfg->scan_status);
+ 		return -EAGAIN;
+ 	}
+@@ -3512,8 +3540,8 @@ static s32
+ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,
+ 		      void *data)
+ {
+-	struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = ifp->drvr;
++	struct brcmf_cfg80211_info *cfg = drvr->config;
+ 	struct brcmf_pno_scanresults_le *pfn_result;
+ 	struct brcmf_pno_net_info_le *netinfo;
+ 
+@@ -3532,7 +3560,7 @@ brcmf_wowl_nd_results(struct brcmf_if *i
+ 	}
+ 
+ 	if (le32_to_cpu(pfn_result->count) < 1) {
+-		bphy_err(wiphy, "Invalid result count, expected 1 (%d)\n",
++		bphy_err(drvr, "Invalid result count, expected 1 (%d)\n",
+ 			 le32_to_cpu(pfn_result->count));
+ 		return -EINVAL;
+ 	}
+@@ -3560,6 +3588,7 @@ brcmf_wowl_nd_results(struct brcmf_if *i
+ static void brcmf_report_wowl_wakeind(struct wiphy *wiphy, struct brcmf_if *ifp)
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_wowl_wakeind_le wake_ind_le;
+ 	struct cfg80211_wowlan_wakeup wakeup_data;
+ 	struct cfg80211_wowlan_wakeup *wakeup;
+@@ -3570,7 +3599,7 @@ static void brcmf_report_wowl_wakeind(st
+ 	err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &wake_ind_le,
+ 				       sizeof(wake_ind_le));
+ 	if (err) {
+-		bphy_err(wiphy, "Get wowl_wakeind failed, err = %d\n", err);
++		bphy_err(drvr, "Get wowl_wakeind failed, err = %d\n", err);
+ 		return;
+ 	}
+ 
+@@ -3611,7 +3640,7 @@ static void brcmf_report_wowl_wakeind(st
+ 				cfg->wowl.nd_data_completed,
+ 				BRCMF_ND_INFO_TIMEOUT);
+ 			if (!timeout)
+-				bphy_err(wiphy, "No result for wowl net detect\n");
++				bphy_err(drvr, "No result for wowl net detect\n");
+ 			else
+ 				wakeup_data.net_detect = cfg->wowl.nd_info;
+ 		}
+@@ -3800,6 +3829,7 @@ brcmf_cfg80211_set_pmksa(struct wiphy *w
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 	u32 npmk, i;
+ 
+@@ -3819,7 +3849,7 @@ brcmf_cfg80211_set_pmksa(struct wiphy *w
+ 			cfg->pmk_list.npmk = cpu_to_le32(npmk);
+ 		}
+ 	} else {
+-		bphy_err(wiphy, "Too many PMKSA entries cached %d\n", npmk);
++		bphy_err(drvr, "Too many PMKSA entries cached %d\n", npmk);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -3842,6 +3872,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *w
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 	u32 npmk, i;
+ 
+@@ -3865,7 +3896,7 @@ brcmf_cfg80211_del_pmksa(struct wiphy *w
+ 		memset(&pmk[i], 0, sizeof(*pmk));
+ 		cfg->pmk_list.npmk = cpu_to_le32(npmk - 1);
+ 	} else {
+-		bphy_err(wiphy, "Cache entry not found\n");
++		bphy_err(drvr, "Cache entry not found\n");
+ 		return -EINVAL;
+ 	}
+ 
+@@ -3897,25 +3928,25 @@ brcmf_cfg80211_flush_pmksa(struct wiphy
+ 
+ static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err;
+ 
+ 	/* set auth */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "auth", 0);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "auth error %d\n", err);
++		bphy_err(drvr, "auth error %d\n", err);
+ 		return err;
+ 	}
+ 	/* set wsec */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", 0);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "wsec error %d\n", err);
++		bphy_err(drvr, "wsec error %d\n", err);
+ 		return err;
+ 	}
+ 	/* set upper-layer auth */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", WPA_AUTH_NONE);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "wpa_auth error %d\n", err);
++		bphy_err(drvr, "wpa_auth error %d\n", err);
+ 		return err;
+ 	}
+ 
+@@ -3935,7 +3966,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 		      const struct brcmf_vs_tlv *wpa_ie,
+ 		      bool is_rsn_ie)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	u32 auth = 0; /* d11 open authentication */
+ 	u16 count;
+ 	s32 err = 0;
+@@ -3966,13 +3997,13 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 	/* check for multicast cipher suite */
+ 	if (offset + WPA_IE_MIN_OUI_LEN > len) {
+ 		err = -EINVAL;
+-		bphy_err(wiphy, "no multicast cipher suite\n");
++		bphy_err(drvr, "no multicast cipher suite\n");
+ 		goto exit;
+ 	}
+ 
+ 	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
+ 		err = -EINVAL;
+-		bphy_err(wiphy, "ivalid OUI\n");
++		bphy_err(drvr, "ivalid OUI\n");
+ 		goto exit;
+ 	}
+ 	offset += TLV_OUI_LEN;
+@@ -3994,7 +4025,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 		break;
+ 	default:
+ 		err = -EINVAL;
+-		bphy_err(wiphy, "Invalid multi cast cipher info\n");
++		bphy_err(drvr, "Invalid multi cast cipher info\n");
+ 		goto exit;
+ 	}
+ 
+@@ -4005,13 +4036,13 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 	/* Check for unicast suite(s) */
+ 	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
+ 		err = -EINVAL;
+-		bphy_err(wiphy, "no unicast cipher suite\n");
++		bphy_err(drvr, "no unicast cipher suite\n");
+ 		goto exit;
+ 	}
+ 	for (i = 0; i < count; i++) {
+ 		if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
+ 			err = -EINVAL;
+-			bphy_err(wiphy, "ivalid OUI\n");
++			bphy_err(drvr, "ivalid OUI\n");
+ 			goto exit;
+ 		}
+ 		offset += TLV_OUI_LEN;
+@@ -4029,7 +4060,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 			pval |= AES_ENABLED;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "Invalid unicast security info\n");
++			bphy_err(drvr, "Invalid unicast security info\n");
+ 		}
+ 		offset++;
+ 	}
+@@ -4039,13 +4070,13 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 	/* Check for auth key management suite(s) */
+ 	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
+ 		err = -EINVAL;
+-		bphy_err(wiphy, "no auth key mgmt suite\n");
++		bphy_err(drvr, "no auth key mgmt suite\n");
+ 		goto exit;
+ 	}
+ 	for (i = 0; i < count; i++) {
+ 		if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
+ 			err = -EINVAL;
+-			bphy_err(wiphy, "ivalid OUI\n");
++			bphy_err(drvr, "ivalid OUI\n");
+ 			goto exit;
+ 		}
+ 		offset += TLV_OUI_LEN;
+@@ -4073,7 +4104,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 			wpa_auth |= WPA2_AUTH_1X_SHA256;
+ 			break;
+ 		default:
+-			bphy_err(wiphy, "Invalid key mgmt info\n");
++			bphy_err(drvr, "Invalid key mgmt info\n");
+ 		}
+ 		offset++;
+ 	}
+@@ -4115,7 +4146,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 		err = brcmf_fil_bsscfg_int_set(ifp, "wme_bss_disable",
+ 					       wme_bss_disable);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "wme_bss_disable error %d\n", err);
++			bphy_err(drvr, "wme_bss_disable error %d\n", err);
+ 			goto exit;
+ 		}
+ 
+@@ -4129,7 +4160,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 							&data[offset],
+ 							WPA_IE_MIN_OUI_LEN);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "bip error %d\n", err);
++				bphy_err(drvr, "bip error %d\n", err);
+ 				goto exit;
+ 			}
+ 		}
+@@ -4140,13 +4171,13 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 	/* set auth */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "auth", auth);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "auth error %d\n", err);
++		bphy_err(drvr, "auth error %d\n", err);
+ 		goto exit;
+ 	}
+ 	/* set wsec */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "wsec error %d\n", err);
++		bphy_err(drvr, "wsec error %d\n", err);
+ 		goto exit;
+ 	}
+ 	/* Configure MFP, this needs to go after wsec otherwise the wsec command
+@@ -4155,14 +4186,14 @@ brcmf_configure_wpaie(struct brcmf_if *i
+ 	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP)) {
+ 		err = brcmf_fil_bsscfg_int_set(ifp, "mfp", mfp);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "mfp error %d\n", err);
++			bphy_err(drvr, "mfp error %d\n", err);
+ 			goto exit;
+ 		}
+ 	}
+ 	/* set upper-layer auth */
+ 	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_auth);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "wpa_auth error %d\n", err);
++		bphy_err(drvr, "wpa_auth error %d\n", err);
+ 		goto exit;
+ 	}
+ 
+@@ -4248,8 +4279,8 @@ brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8
+ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
+ 			  const u8 *vndr_ie_buf, u32 vndr_ie_len)
+ {
++	struct brcmf_pub *drvr;
+ 	struct brcmf_if *ifp;
+-	struct wiphy *wiphy;
+ 	struct vif_saved_ie *saved_ie;
+ 	s32 err = 0;
+ 	u8  *iovar_ie_buf;
+@@ -4270,7 +4301,7 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_c
+ 	if (!vif)
+ 		return -ENODEV;
+ 	ifp = vif->ifp;
+-	wiphy = ifp->drvr->wiphy;
++	drvr = ifp->drvr;
+ 	saved_ie = &vif->saved_ie;
+ 
+ 	brcmf_dbg(TRACE, "bsscfgidx %d, pktflag : 0x%02X\n", ifp->bsscfgidx,
+@@ -4302,13 +4333,13 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_c
+ 		break;
+ 	default:
+ 		err = -EPERM;
+-		bphy_err(wiphy, "not suitable type\n");
++		bphy_err(drvr, "not suitable type\n");
+ 		goto exit;
+ 	}
+ 
+ 	if (vndr_ie_len > mgmt_ie_buf_len) {
+ 		err = -ENOMEM;
+-		bphy_err(wiphy, "extra IE size too big\n");
++		bphy_err(drvr, "extra IE size too big\n");
+ 		goto exit;
+ 	}
+ 
+@@ -4369,7 +4400,7 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_c
+ 			/* verify remained buf size before copy data */
+ 			if (remained_buf_len < (vndrie_info->vndrie.len +
+ 							VNDR_IE_VSIE_OFFSET)) {
+-				bphy_err(wiphy, "no space in mgmt_ie_buf: len left %d",
++				bphy_err(drvr, "no space in mgmt_ie_buf: len left %d",
+ 					 remained_buf_len);
+ 				break;
+ 			}
+@@ -4401,7 +4432,7 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_c
+ 		err  = brcmf_fil_bsscfg_data_set(ifp, "vndr_ie", iovar_ie_buf,
+ 						 total_ie_buf_len);
+ 		if (err)
+-			bphy_err(wiphy, "vndr ie set error : %d\n", err);
++			bphy_err(drvr, "vndr ie set error : %d\n", err);
+ 	}
+ 
+ exit:
+@@ -4429,14 +4460,14 @@ static s32
+ brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif,
+ 			struct cfg80211_beacon_data *beacon)
+ {
+-	struct wiphy *wiphy = vif->ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = vif->ifp->drvr;
+ 	s32 err;
+ 
+ 	/* Set Beacon IEs to FW */
+ 	err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_BEACON_FLAG,
+ 				    beacon->tail, beacon->tail_len);
+ 	if (err) {
+-		bphy_err(wiphy, "Set Beacon IE Failed\n");
++		bphy_err(drvr, "Set Beacon IE Failed\n");
+ 		return err;
+ 	}
+ 	brcmf_dbg(TRACE, "Applied Vndr IEs for Beacon\n");
+@@ -4446,7 +4477,7 @@ brcmf_config_ap_mgmt_ie(struct brcmf_cfg
+ 				    beacon->proberesp_ies,
+ 				    beacon->proberesp_ies_len);
+ 	if (err)
+-		bphy_err(wiphy, "Set Probe Resp IE Failed\n");
++		bphy_err(drvr, "Set Probe Resp IE Failed\n");
+ 	else
+ 		brcmf_dbg(TRACE, "Applied Vndr IEs for Probe Resp\n");
+ 
+@@ -4460,6 +4491,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 	s32 ie_offset;
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	const struct brcmf_tlv *ssid_ie;
+ 	const struct brcmf_tlv *country_ie;
+ 	struct brcmf_ssid_le ssid_le;
+@@ -4555,7 +4587,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
+ 						    is_11d);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "Regulatory Set Error, %d\n",
++				bphy_err(drvr, "Regulatory Set Error, %d\n",
+ 					 err);
+ 				goto exit;
+ 			}
+@@ -4564,7 +4596,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD,
+ 						    settings->beacon_interval);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "Beacon Interval Set Error, %d\n",
++				bphy_err(drvr, "Beacon Interval Set Error, %d\n",
+ 					 err);
+ 				goto exit;
+ 			}
+@@ -4573,7 +4605,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_DTIMPRD,
+ 						    settings->dtim_period);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "DTIM Interval Set Error, %d\n",
++				bphy_err(drvr, "DTIM Interval Set Error, %d\n",
+ 					 err);
+ 				goto exit;
+ 			}
+@@ -4584,7 +4616,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 		     !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) {
+ 			err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "BRCMF_C_DOWN error %d\n",
++				bphy_err(drvr, "BRCMF_C_DOWN error %d\n",
+ 					 err);
+ 				goto exit;
+ 			}
+@@ -4593,7 +4625,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 1);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "SET INFRA error %d\n", err);
++			bphy_err(drvr, "SET INFRA error %d\n", err);
+ 			goto exit;
+ 		}
+ 	} else if (WARN_ON(supports_11d && (is_11d != ifp->vif->is_11d))) {
+@@ -4609,7 +4641,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 1);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "setting AP mode failed %d\n",
++			bphy_err(drvr, "setting AP mode failed %d\n",
+ 				 err);
+ 			goto exit;
+ 		}
+@@ -4619,14 +4651,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 			 */
+ 			err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
+ 			if (err < 0) {
+-				bphy_err(wiphy, "Set Channel failed: chspec=%d, %d\n",
++				bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
+ 					 chanspec, err);
+ 				goto exit;
+ 			}
+ 		}
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "BRCMF_C_UP error (%d)\n", err);
++			bphy_err(drvr, "BRCMF_C_UP error (%d)\n", err);
+ 			goto exit;
+ 		}
+ 		/* On DOWN the firmware removes the WEP keys, reconfigure
+@@ -4641,14 +4673,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 		err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
+ 					     &join_params, sizeof(join_params));
+ 		if (err < 0) {
+-			bphy_err(wiphy, "SET SSID error (%d)\n", err);
++			bphy_err(drvr, "SET SSID error (%d)\n", err);
+ 			goto exit;
+ 		}
+ 
+ 		if (settings->hidden_ssid) {
+ 			err = brcmf_fil_iovar_int_set(ifp, "closednet", 1);
+ 			if (err) {
+-				bphy_err(wiphy, "closednet error (%d)\n", err);
++				bphy_err(drvr, "closednet error (%d)\n", err);
+ 				goto exit;
+ 			}
+ 		}
+@@ -4657,14 +4689,14 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 	} else if (dev_role == NL80211_IFTYPE_P2P_GO) {
+ 		err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
+ 		if (err < 0) {
+-			bphy_err(wiphy, "Set Channel failed: chspec=%d, %d\n",
++			bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
+ 				 chanspec, err);
+ 			goto exit;
+ 		}
+ 		err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
+ 						sizeof(ssid_le));
+ 		if (err < 0) {
+-			bphy_err(wiphy, "setting ssid failed %d\n", err);
++			bphy_err(drvr, "setting ssid failed %d\n", err);
+ 			goto exit;
+ 		}
+ 		bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
+@@ -4672,7 +4704,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
+ 		err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
+ 					       sizeof(bss_enable));
+ 		if (err < 0) {
+-			bphy_err(wiphy, "bss_enable config failed %d\n", err);
++			bphy_err(drvr, "bss_enable config failed %d\n", err);
+ 			goto exit;
+ 		}
+ 
+@@ -4695,7 +4727,9 @@ exit:
+ 
+ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 	struct brcmf_fil_bss_enable_le bss_enable;
+ 	struct brcmf_join_params join_params;
+@@ -4720,13 +4754,13 @@ static int brcmf_cfg80211_stop_ap(struct
+ 		err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
+ 					     &join_params, sizeof(join_params));
+ 		if (err < 0)
+-			bphy_err(wiphy, "SET SSID error (%d)\n", err);
++			bphy_err(drvr, "SET SSID error (%d)\n", err);
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
+ 		if (err < 0)
+-			bphy_err(wiphy, "BRCMF_C_DOWN error %d\n", err);
++			bphy_err(drvr, "BRCMF_C_DOWN error %d\n", err);
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
+ 		if (err < 0)
+-			bphy_err(wiphy, "setting AP mode failed %d\n", err);
++			bphy_err(drvr, "setting AP mode failed %d\n", err);
+ 		if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
+ 			brcmf_fil_iovar_int_set(ifp, "mbss", 0);
+ 		brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
+@@ -4734,7 +4768,7 @@ static int brcmf_cfg80211_stop_ap(struct
+ 		/* Bring device back up so it can be used again */
+ 		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
+ 		if (err < 0)
+-			bphy_err(wiphy, "BRCMF_C_UP error %d\n", err);
++			bphy_err(drvr, "BRCMF_C_UP error %d\n", err);
+ 
+ 		brcmf_vif_clear_mgmt_ies(ifp->vif);
+ 	} else {
+@@ -4743,7 +4777,7 @@ static int brcmf_cfg80211_stop_ap(struct
+ 		err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
+ 					       sizeof(bss_enable));
+ 		if (err < 0)
+-			bphy_err(wiphy, "bss_enable config failed %d\n", err);
++			bphy_err(drvr, "bss_enable config failed %d\n", err);
+ 	}
+ 	brcmf_set_mpc(ifp, 1);
+ 	brcmf_configure_arp_nd_offload(ifp, true);
+@@ -4772,6 +4806,7 @@ brcmf_cfg80211_del_station(struct wiphy
+ 			   struct station_del_parameters *params)
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_scb_val_le scbval;
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	s32 err;
+@@ -4791,7 +4826,7 @@ brcmf_cfg80211_del_station(struct wiphy
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
+ 				     &scbval, sizeof(scbval));
+ 	if (err)
+-		bphy_err(wiphy, "SCB_DEAUTHENTICATE_FOR_REASON failed %d\n",
++		bphy_err(drvr, "SCB_DEAUTHENTICATE_FOR_REASON failed %d\n",
+ 			 err);
+ 
+ 	brcmf_dbg(TRACE, "Exit\n");
+@@ -4802,7 +4837,9 @@ static int
+ brcmf_cfg80211_change_station(struct wiphy *wiphy, struct net_device *ndev,
+ 			      const u8 *mac, struct station_parameters *params)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	s32 err;
+ 
+ 	brcmf_dbg(TRACE, "Enter, MAC %pM, mask 0x%04x set 0x%04x\n", mac,
+@@ -4822,7 +4859,7 @@ brcmf_cfg80211_change_station(struct wip
+ 		err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_DEAUTHORIZE,
+ 					     (void *)mac, ETH_ALEN);
+ 	if (err < 0)
+-		bphy_err(wiphy, "Setting SCB (de-)authorize failed, %d\n", err);
++		bphy_err(drvr, "Setting SCB (de-)authorize failed, %d\n", err);
+ 
+ 	return err;
+ }
+@@ -4852,6 +4889,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wip
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct ieee80211_channel *chan = params->chan;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	const u8 *buf = params->buf;
+ 	size_t len = params->len;
+ 	const struct ieee80211_mgmt *mgmt;
+@@ -4872,7 +4910,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wip
+ 	mgmt = (const struct ieee80211_mgmt *)buf;
+ 
+ 	if (!ieee80211_is_mgmt(mgmt->frame_control)) {
+-		bphy_err(wiphy, "Driver only allows MGMT packet type\n");
++		bphy_err(drvr, "Driver only allows MGMT packet type\n");
+ 		return -EPERM;
+ 	}
+ 
+@@ -4903,13 +4941,13 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wip
+ 					GFP_KERNEL);
+ 	} else if (ieee80211_is_action(mgmt->frame_control)) {
+ 		if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
+-			bphy_err(wiphy, "invalid action frame length\n");
++			bphy_err(drvr, "invalid action frame length\n");
+ 			err = -EINVAL;
+ 			goto exit;
+ 		}
+ 		af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
+ 		if (af_params == NULL) {
+-			bphy_err(wiphy, "unable to allocate frame\n");
++			bphy_err(drvr, "unable to allocate frame\n");
+ 			err = -ENOMEM;
+ 			goto exit;
+ 		}
+@@ -4960,6 +4998,7 @@ brcmf_cfg80211_cancel_remain_on_channel(
+ 					u64 cookie)
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_cfg80211_vif *vif;
+ 	int err = 0;
+ 
+@@ -4967,7 +5006,7 @@ brcmf_cfg80211_cancel_remain_on_channel(
+ 
+ 	vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
+ 	if (vif == NULL) {
+-		bphy_err(wiphy, "No p2p device available for probe response\n");
++		bphy_err(drvr, "No p2p device available for probe response\n");
+ 		err = -ENODEV;
+ 		goto exit;
+ 	}
+@@ -4982,6 +5021,7 @@ static int brcmf_cfg80211_get_channel(st
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct net_device *ndev = wdev->netdev;
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_if *ifp;
+ 	struct brcmu_chan ch;
+ 	enum nl80211_band band = 0;
+@@ -4995,7 +5035,7 @@ static int brcmf_cfg80211_get_channel(st
+ 
+ 	err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
+ 	if (err) {
+-		bphy_err(wiphy, "chanspec failed (%d)\n", err);
++		bphy_err(drvr, "chanspec failed (%d)\n", err);
+ 		return err;
+ 	}
+ 
+@@ -5117,6 +5157,8 @@ static int brcmf_cfg80211_tdls_oper(stru
+ 				    struct net_device *ndev, const u8 *peer,
+ 				    enum nl80211_tdls_operation oper)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_if *ifp;
+ 	struct brcmf_tdls_iovar_le info;
+ 	int ret = 0;
+@@ -5134,7 +5176,7 @@ static int brcmf_cfg80211_tdls_oper(stru
+ 	ret = brcmf_fil_iovar_data_set(ifp, "tdls_endpoint",
+ 				       &info, sizeof(info));
+ 	if (ret < 0)
+-		bphy_err(wiphy, "tdls_endpoint iovar failed: ret=%d\n", ret);
++		bphy_err(drvr, "tdls_endpoint iovar failed: ret=%d\n", ret);
+ 
+ 	return ret;
+ }
+@@ -5145,6 +5187,8 @@ brcmf_cfg80211_update_conn_params(struct
+ 				  struct cfg80211_connect_params *sme,
+ 				  u32 changed)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_if *ifp;
+ 	int err;
+ 
+@@ -5155,7 +5199,7 @@ brcmf_cfg80211_update_conn_params(struct
+ 	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
+ 				    sme->ie, sme->ie_len);
+ 	if (err)
+-		bphy_err(wiphy, "Set Assoc REQ IE Failed\n");
++		bphy_err(drvr, "Set Assoc REQ IE Failed\n");
+ 	else
+ 		brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
+ 
+@@ -5167,6 +5211,8 @@ static int
+ brcmf_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *ndev,
+ 			      struct cfg80211_gtk_rekey_data *gtk)
+ {
++	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_if *ifp = netdev_priv(ndev);
+ 	struct brcmf_gtk_keyinfo_le gtk_le;
+ 	int ret;
+@@ -5181,7 +5227,7 @@ brcmf_cfg80211_set_rekey_data(struct wip
+ 	ret = brcmf_fil_iovar_data_set(ifp, "gtk_key_info", &gtk_le,
+ 				       sizeof(gtk_le));
+ 	if (ret < 0)
+-		bphy_err(wiphy, "gtk_key_info iovar failed: ret=%d\n", ret);
++		bphy_err(drvr, "gtk_key_info iovar failed: ret=%d\n", ret);
+ 
+ 	return ret;
+ }
+@@ -5359,7 +5405,7 @@ static void brcmf_clear_assoc_ies(struct
+ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
+ 			       struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_cfg80211_assoc_ielen_le *assoc_info;
+ 	struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg);
+ 	u32 req_len;
+@@ -5371,7 +5417,7 @@ static s32 brcmf_get_assoc_ies(struct br
+ 	err = brcmf_fil_iovar_data_get(ifp, "assoc_info",
+ 				       cfg->extra_buf, WL_ASSOC_INFO_MAX);
+ 	if (err) {
+-		bphy_err(wiphy, "could not get assoc info (%d)\n", err);
++		bphy_err(drvr, "could not get assoc info (%d)\n", err);
+ 		return err;
+ 	}
+ 	assoc_info =
+@@ -5383,7 +5429,7 @@ static s32 brcmf_get_assoc_ies(struct br
+ 					       cfg->extra_buf,
+ 					       WL_ASSOC_INFO_MAX);
+ 		if (err) {
+-			bphy_err(wiphy, "could not get assoc req (%d)\n", err);
++			bphy_err(drvr, "could not get assoc req (%d)\n", err);
+ 			return err;
+ 		}
+ 		conn_info->req_ie_len = req_len;
+@@ -5399,7 +5445,7 @@ static s32 brcmf_get_assoc_ies(struct br
+ 					       cfg->extra_buf,
+ 					       WL_ASSOC_INFO_MAX);
+ 		if (err) {
+-			bphy_err(wiphy, "could not get assoc resp (%d)\n", err);
++			bphy_err(drvr, "could not get assoc resp (%d)\n", err);
+ 			return err;
+ 		}
+ 		conn_info->resp_ie_len = resp_len;
+@@ -5518,7 +5564,7 @@ brcmf_notify_connect_status_ap(struct br
+ 			       struct net_device *ndev,
+ 			       const struct brcmf_event_msg *e, void *data)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	static int generation;
+ 	u32 event = e->event_code;
+ 	u32 reason = e->reason;
+@@ -5537,7 +5583,7 @@ brcmf_notify_connect_status_ap(struct br
+ 	    (reason == BRCMF_E_STATUS_SUCCESS)) {
+ 		memset(&sinfo, 0, sizeof(sinfo));
+ 		if (!data) {
+-			bphy_err(wiphy, "No IEs present in ASSOC/REASSOC_IND\n");
++			bphy_err(drvr, "No IEs present in ASSOC/REASSOC_IND\n");
+ 			return -EINVAL;
+ 		}
+ 		sinfo.assoc_req_ies = data;
+@@ -5818,7 +5864,7 @@ static void init_vif_event(struct brcmf_
+ 
+ static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err;
+ 	u32 bcn_timeout;
+ 	__le32 roamtrigger[2];
+@@ -5831,7 +5877,7 @@ static s32 brcmf_dongle_roam(struct brcm
+ 		bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON;
+ 	err = brcmf_fil_iovar_int_set(ifp, "bcn_timeout", bcn_timeout);
+ 	if (err) {
+-		bphy_err(wiphy, "bcn_timeout error (%d)\n", err);
++		bphy_err(drvr, "bcn_timeout error (%d)\n", err);
+ 		goto roam_setup_done;
+ 	}
+ 
+@@ -5843,7 +5889,7 @@ static s32 brcmf_dongle_roam(struct brcm
+ 	err = brcmf_fil_iovar_int_set(ifp, "roam_off",
+ 				      ifp->drvr->settings->roamoff);
+ 	if (err) {
+-		bphy_err(wiphy, "roam_off error (%d)\n", err);
++		bphy_err(drvr, "roam_off error (%d)\n", err);
+ 		goto roam_setup_done;
+ 	}
+ 
+@@ -5852,7 +5898,7 @@ static s32 brcmf_dongle_roam(struct brcm
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
+ 				     (void *)roamtrigger, sizeof(roamtrigger));
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
++		bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
+ 		goto roam_setup_done;
+ 	}
+ 
+@@ -5861,7 +5907,7 @@ static s32 brcmf_dongle_roam(struct brcm
+ 	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
+ 				     (void *)roam_delta, sizeof(roam_delta));
+ 	if (err) {
+-		bphy_err(wiphy, "WLC_SET_ROAM_DELTA error (%d)\n", err);
++		bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
+ 		goto roam_setup_done;
+ 	}
+ 
+@@ -5872,26 +5918,26 @@ roam_setup_done:
+ static s32
+ brcmf_dongle_scantime(struct brcmf_if *ifp)
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	s32 err = 0;
+ 
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
+ 				    BRCMF_SCAN_CHANNEL_TIME);
+ 	if (err) {
+-		bphy_err(wiphy, "Scan assoc time error (%d)\n", err);
++		bphy_err(drvr, "Scan assoc time error (%d)\n", err);
+ 		goto dongle_scantime_out;
+ 	}
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
+ 				    BRCMF_SCAN_UNASSOC_TIME);
+ 	if (err) {
+-		bphy_err(wiphy, "Scan unassoc time error (%d)\n", err);
++		bphy_err(drvr, "Scan unassoc time error (%d)\n", err);
+ 		goto dongle_scantime_out;
+ 	}
+ 
+ 	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_PASSIVE_TIME,
+ 				    BRCMF_SCAN_PASSIVE_TIME);
+ 	if (err) {
+-		bphy_err(wiphy, "Scan passive time error (%d)\n", err);
++		bphy_err(drvr, "Scan passive time error (%d)\n", err);
+ 		goto dongle_scantime_out;
+ 	}
+ 
+@@ -5924,7 +5970,8 @@ static int brcmf_construct_chaninfo(stru
+ 				    u32 bw_cap[])
+ {
+ 	struct wiphy *wiphy = cfg_to_wiphy(cfg);
+-	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
++	struct brcmf_pub *drvr = cfg->pub;
++	struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
+ 	struct ieee80211_supported_band *band;
+ 	struct ieee80211_channel *channel;
+ 	struct brcmf_chanspec_list *list;
+@@ -5945,7 +5992,7 @@ static int brcmf_construct_chaninfo(stru
+ 	err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
+ 				       BRCMF_DCMD_MEDLEN);
+ 	if (err) {
+-		bphy_err(wiphy, "get chanspecs error (%d)\n", err);
++		bphy_err(drvr, "get chanspecs error (%d)\n", err);
+ 		goto fail_pbuf;
+ 	}
+ 
+@@ -5968,7 +6015,7 @@ static int brcmf_construct_chaninfo(stru
+ 		} else if (ch.band == BRCMU_CHAN_BAND_5G) {
+ 			band = wiphy->bands[NL80211_BAND_5GHZ];
+ 		} else {
+-			bphy_err(wiphy, "Invalid channel Spec. 0x%x.\n",
++			bphy_err(drvr, "Invalid channel Spec. 0x%x.\n",
+ 				 ch.chspec);
+ 			continue;
+ 		}
+@@ -5992,7 +6039,7 @@ static int brcmf_construct_chaninfo(stru
+ 			/* It seems firmware supports some channel we never
+ 			 * considered. Something new in IEEE standard?
+ 			 */
+-			bphy_err(wiphy, "Ignoring unexpected firmware channel %d\n",
++			bphy_err(drvr, "Ignoring unexpected firmware channel %d\n",
+ 				 ch.control_ch_num);
+ 			continue;
+ 		}
+@@ -6049,8 +6096,8 @@ fail_pbuf:
+ 
+ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
+ {
+-	struct wiphy *wiphy = cfg_to_wiphy(cfg);
+-	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
++	struct brcmf_pub *drvr = cfg->pub;
++	struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
+ 	struct ieee80211_supported_band *band;
+ 	struct brcmf_fil_bwcap_le band_bwcap;
+ 	struct brcmf_chanspec_list *list;
+@@ -6096,7 +6143,7 @@ static int brcmf_enable_bw40_2g(struct b
+ 		err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
+ 					       BRCMF_DCMD_MEDLEN);
+ 		if (err) {
+-			bphy_err(wiphy, "get chanspecs error (%d)\n", err);
++			bphy_err(drvr, "get chanspecs error (%d)\n", err);
+ 			kfree(pbuf);
+ 			return err;
+ 		}
+@@ -6127,7 +6174,7 @@ static int brcmf_enable_bw40_2g(struct b
+ 
+ static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
+ {
+-	struct wiphy *wiphy = ifp->drvr->wiphy;
++	struct brcmf_pub *drvr = ifp->drvr;
+ 	u32 band, mimo_bwcap;
+ 	int err;
+ 
+@@ -6163,7 +6210,7 @@ static void brcmf_get_bwcap(struct brcmf
+ 		bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;
+ 		break;
+ 	default:
+-		bphy_err(wiphy, "invalid mimo_bw_cap value\n");
++		bphy_err(drvr, "invalid mimo_bw_cap value\n");
+ 	}
+ }
+ 
+@@ -6238,7 +6285,8 @@ static void brcmf_update_vht_cap(struct
+ 
+ static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
+ {
+-	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
++	struct brcmf_pub *drvr = cfg->pub;
++	struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
+ 	struct wiphy *wiphy = cfg_to_wiphy(cfg);
+ 	u32 nmode = 0;
+ 	u32 vhtmode = 0;
+@@ -6255,7 +6303,7 @@ static int brcmf_setup_wiphybands(struct
+ 	(void)brcmf_fil_iovar_int_get(ifp, "vhtmode", &vhtmode);
+ 	err = brcmf_fil_iovar_int_get(ifp, "nmode", &nmode);
+ 	if (err) {
+-		bphy_err(wiphy, "nmode error (%d)\n", err);
++		bphy_err(drvr, "nmode error (%d)\n", err);
+ 	} else {
+ 		brcmf_get_bwcap(ifp, bw_cap);
+ 	}
+@@ -6265,7 +6313,7 @@ static int brcmf_setup_wiphybands(struct
+ 
+ 	err = brcmf_fil_iovar_int_get(ifp, "rxchain", &rxchain);
+ 	if (err) {
+-		bphy_err(wiphy, "rxchain error (%d)\n", err);
++		bphy_err(drvr, "rxchain error (%d)\n", err);
+ 		nchain = 1;
+ 	} else {
+ 		for (nchain = 0; rxchain; nchain++)
+@@ -6275,7 +6323,7 @@ static int brcmf_setup_wiphybands(struct
+ 
+ 	err = brcmf_construct_chaninfo(cfg, bw_cap);
+ 	if (err) {
+-		bphy_err(wiphy, "brcmf_construct_chaninfo failed (%d)\n", err);
++		bphy_err(drvr, "brcmf_construct_chaninfo failed (%d)\n", err);
+ 		return err;
+ 	}
+ 
+@@ -6492,12 +6540,13 @@ static void brcmf_wiphy_wowl_params(stru
+ {
+ #ifdef CONFIG_PM
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct wiphy_wowlan_support *wowl;
+ 
+ 	wowl = kmemdup(&brcmf_wowlan_support, sizeof(brcmf_wowlan_support),
+ 		       GFP_KERNEL);
+ 	if (!wowl) {
+-		bphy_err(wiphy, "only support basic wowlan features\n");
++		bphy_err(drvr, "only support basic wowlan features\n");
+ 		wiphy->wowlan = &brcmf_wowlan_support;
+ 		return;
+ 	}
+@@ -6585,7 +6634,7 @@ static int brcmf_setup_wiphy(struct wiph
+ 	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST, &bandlist,
+ 				     sizeof(bandlist));
+ 	if (err) {
+-		bphy_err(wiphy, "could not obtain band info: err=%d\n", err);
++		bphy_err(drvr, "could not obtain band info: err=%d\n", err);
+ 		return err;
+ 	}
+ 	/* first entry in bandlist is number of bands */
+@@ -6846,6 +6895,7 @@ static void brcmf_cfg80211_reg_notifier(
+ {
+ 	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
+ 	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
++	struct brcmf_pub *drvr = cfg->pub;
+ 	struct brcmf_fil_country_le ccreq;
+ 	s32 err;
+ 	int i;
+@@ -6857,7 +6907,7 @@ static void brcmf_cfg80211_reg_notifier(
+ 	/* ignore non-ISO3166 country codes */
+ 	for (i = 0; i < 2; i++)
+ 		if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
+-			bphy_err(wiphy, "not a ISO3166 code (0x%02x 0x%02x)\n",
++			bphy_err(drvr, "not a ISO3166 code (0x%02x 0x%02x)\n",
+ 				 req->alpha2[0], req->alpha2[1]);
+ 			return;
+ 		}
+@@ -6867,7 +6917,7 @@ static void brcmf_cfg80211_reg_notifier(
+ 
+ 	err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
+ 	if (err) {
+-		bphy_err(wiphy, "Country code iovar returned err = %d\n", err);
++		bphy_err(drvr, "Country code iovar returned err = %d\n", err);
+ 		return;
+ 	}
+ 
+@@ -6877,7 +6927,7 @@ static void brcmf_cfg80211_reg_notifier(
+ 
+ 	err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
+ 	if (err) {
+-		bphy_err(wiphy, "Firmware rejected country setting\n");
++		bphy_err(drvr, "Firmware rejected country setting\n");
+ 		return;
+ 	}
+ 	brcmf_setup_wiphybands(cfg);
+@@ -6923,13 +6973,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ 	u16 *cap = NULL;
+ 
+ 	if (!ndev) {
+-		bphy_err(wiphy, "ndev is invalid\n");
++		bphy_err(drvr, "ndev is invalid\n");
+ 		return NULL;
+ 	}
+ 
+ 	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
+ 	if (!cfg) {
+-		bphy_err(wiphy, "Could not allocate wiphy device\n");
++		bphy_err(drvr, "Could not allocate wiphy device\n");
+ 		return NULL;
+ 	}
+ 
+@@ -6950,7 +7000,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ 
+ 	err = wl_init_priv(cfg);
+ 	if (err) {
+-		bphy_err(wiphy, "Failed to init iwm_priv (%d)\n", err);
++		bphy_err(drvr, "Failed to init iwm_priv (%d)\n", err);
+ 		brcmf_free_vif(vif);
+ 		goto wiphy_out;
+ 	}
+@@ -6959,7 +7009,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ 	/* determine d11 io type before wiphy setup */
+ 	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION, &io_type);
+ 	if (err) {
+-		bphy_err(wiphy, "Failed to get D11 version (%d)\n", err);
++		bphy_err(drvr, "Failed to get D11 version (%d)\n", err);
+ 		goto priv_out;
+ 	}
+ 	cfg->d11inf.io_type = (u8)io_type;
+@@ -6993,13 +7043,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ #endif
+ 	err = wiphy_register(wiphy);
+ 	if (err < 0) {
+-		bphy_err(wiphy, "Could not register wiphy device (%d)\n", err);
++		bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
+ 		goto priv_out;
+ 	}
+ 
+ 	err = brcmf_setup_wiphybands(cfg);
+ 	if (err) {
+-		bphy_err(wiphy, "Setting wiphy bands failed (%d)\n", err);
++		bphy_err(drvr, "Setting wiphy bands failed (%d)\n", err);
+ 		goto wiphy_unreg_out;
+ 	}
+ 
+@@ -7017,18 +7067,18 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ 
+ 	err = brcmf_fweh_activate_events(ifp);
+ 	if (err) {
+-		bphy_err(wiphy, "FWEH activation failed (%d)\n", err);
++		bphy_err(drvr, "FWEH activation failed (%d)\n", err);
+ 		goto wiphy_unreg_out;
+ 	}
+ 
+ 	err = brcmf_p2p_attach(cfg, p2pdev_forced);
+ 	if (err) {
+-		bphy_err(wiphy, "P2P initialisation failed (%d)\n", err);
++		bphy_err(drvr, "P2P initialisation failed (%d)\n", err);
+ 		goto wiphy_unreg_out;
+ 	}
+ 	err = brcmf_btcoex_attach(cfg);
+ 	if (err) {
+-		bphy_err(wiphy, "BT-coex initialisation failed (%d)\n", err);
++		bphy_err(drvr, "BT-coex initialisation failed (%d)\n", err);
+ 		brcmf_p2p_detach(&cfg->p2p);
+ 		goto wiphy_unreg_out;
+ 	}
+@@ -7047,7 +7097,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+ 	/* (re-) activate FWEH event handling */
+ 	err = brcmf_fweh_activate_events(ifp);
+ 	if (err) {
+-		bphy_err(wiphy, "FWEH activation failed (%d)\n", err);
++		bphy_err(drvr, "FWEH activation failed (%d)\n", err);
+ 		goto detach;
+ 	}
+ 
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+@@ -62,12 +62,12 @@ void __brcmf_err(struct brcmf_bus *bus,
+ 	} while (0)
+ #endif
+ 
+-#define bphy_err(wiphy, fmt, ...)					\
++#define bphy_err(drvr, fmt, ...)					\
+ 	do {								\
+ 		if (IS_ENABLED(CPTCFG_BRCMDBG) ||			\
+ 		    IS_ENABLED(CPTCFG_BRCM_TRACING) ||			\
+ 		    net_ratelimit())					\
+-			wiphy_err(wiphy, "%s: " fmt, __func__,		\
++			wiphy_err((drvr)->wiphy, "%s: " fmt, __func__,	\
+ 				  ##__VA_ARGS__);			\
+ 	} while (0)
+