~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,17 +1,6 @@
	1	+// SPDX-License-Identifier: ISC
1	2	/*
2	3	* Copyright (c) 2010 Broadcom Corporation
3		- *
4		- * Permission to use, copy, modify, and/or distribute this software for any
5		- * purpose with or without fee is hereby granted, provided that the above
6		- * copyright notice and this permission notice appear in all copies.
7		- *
8		- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9		- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10		- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
11		- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12		- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
13		- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
14		- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15	4	*/
16	5
17	6	/* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
..	..	@@ -22,6 +11,7 @@
22	11	#include <linux/vmalloc.h>
23	12	#include <net/cfg80211.h>
24	13	#include <net/netlink.h>
	14	+#include <uapi/linux/if_arp.h>
25	15
26	16	#include <brcmu_utils.h>
27	17	#include <defs.h>
..	..	@@ -33,6 +23,7 @@
33	23	#include "p2p.h"
34	24	#include "btcoex.h"
35	25	#include "pno.h"
	26	+#include "fwsignal.h"
36	27	#include "cfg80211.h"
37	28	#include "feature.h"
38	29	#include "fwil.h"
..	..	@@ -65,6 +56,7 @@
65	56	#define RSN_AKM_PSK 2 /* Pre-shared Key */
66	57	#define RSN_AKM_SHA256_1X 5 /* SHA256, 802.1X */
67	58	#define RSN_AKM_SHA256_PSK 6 /* SHA256, Pre-shared Key */
	59	+#define RSN_AKM_SAE 8 /* SAE */
68	60	#define RSN_CAP_LEN 2 /* Length of RSN capabilities */
69	61	#define RSN_CAP_PTK_REPLAY_CNTR_MASK (BIT(2) \| BIT(3))
70	62	#define RSN_CAP_MFPR_MASK BIT(6)
..	..	@@ -92,6 +84,8 @@
92	84	#define BRCMF_SCAN_PASSIVE_TIME 120
93	85
94	86	#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000)
	87	+
	88	+#define BRCMF_PS_MAX_TIMEOUT_MS 2000
95	89
96	90	#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
97	91	(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
..	..	@@ -200,9 +194,9 @@
200	194	*/
201	195	REG_RULE(2484-10, 2484+10, 20, 6, 20, 0),
202	196	/* IEEE 802.11a, channel 36..64 */
203		- REG_RULE(5150-10, 5350+10, 80, 6, 20, 0),
	197	+ REG_RULE(5150-10, 5350+10, 160, 6, 20, 0),
204	198	/* IEEE 802.11a, channel 100..165 */
205		- REG_RULE(5470-10, 5850+10, 80, 6, 20, 0), }
	199	+ REG_RULE(5470-10, 5850+10, 160, 6, 20, 0), }
206	200	};
207	201
208	202	/* Note: brcmf_cipher_suites is an array of int defining which cipher suites
..	..	@@ -287,8 +281,26 @@
287	281	else
288	282	ch_inf.sb = BRCMU_CHAN_SB_UU;
289	283	break;
290		- case NL80211_CHAN_WIDTH_80P80:
291	284	case NL80211_CHAN_WIDTH_160:
	285	+ ch_inf.bw = BRCMU_CHAN_BW_160;
	286	+ if (primary_offset == -70)
	287	+ ch_inf.sb = BRCMU_CHAN_SB_LLL;
	288	+ else if (primary_offset == -50)
	289	+ ch_inf.sb = BRCMU_CHAN_SB_LLU;
	290	+ else if (primary_offset == -30)
	291	+ ch_inf.sb = BRCMU_CHAN_SB_LUL;
	292	+ else if (primary_offset == -10)
	293	+ ch_inf.sb = BRCMU_CHAN_SB_LUU;
	294	+ else if (primary_offset == 10)
	295	+ ch_inf.sb = BRCMU_CHAN_SB_ULL;
	296	+ else if (primary_offset == 30)
	297	+ ch_inf.sb = BRCMU_CHAN_SB_ULU;
	298	+ else if (primary_offset == 50)
	299	+ ch_inf.sb = BRCMU_CHAN_SB_UUL;
	300	+ else
	301	+ ch_inf.sb = BRCMU_CHAN_SB_UUU;
	302	+ break;
	303	+ case NL80211_CHAN_WIDTH_80P80:
292	304	case NL80211_CHAN_WIDTH_5:
293	305	case NL80211_CHAN_WIDTH_10:
294	306	default:
..	..	@@ -307,6 +319,7 @@
307	319	}
308	320	d11inf->encchspec(&ch_inf);
309	321
	322	+ brcmf_dbg(TRACE, "chanspec: 0x%x\n", ch_inf.chspec);
310	323	return ch_inf.chspec;
311	324	}
312	325
..	..	@@ -457,6 +470,7 @@
457	470	static int
458	471	send_key_to_dongle(struct brcmf_if ifp, struct brcmf_wsec_key key)
459	472	{
	473	+ struct brcmf_pub *drvr = ifp->drvr;
460	474	int err;
461	475	struct brcmf_wsec_key_le key_le;
462	476
..	..	@@ -468,7 +482,7 @@
468	482	sizeof(key_le));
469	483
470	484	if (err)
471		- brcmf_err("wsec_key error (%d)\n", err);
	485	+ bphy_err(drvr, "wsec_key error (%d)\n", err);
472	486	return err;
473	487	}
474	488
..	..	@@ -508,6 +522,7 @@
508	522
509	523	static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
510	524	{
	525	+ struct brcmf_pub *drvr = ifp->drvr;
511	526	struct brcmf_mbss_ssid_le mbss_ssid_le;
512	527	int bsscfgidx;
513	528	int err;
..	..	@@ -524,7 +539,7 @@
524	539	err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &mbss_ssid_le,
525	540	sizeof(mbss_ssid_le));
526	541	if (err < 0)
527		- brcmf_err("setting ssid failed %d\n", err);
	542	+ bphy_err(drvr, "setting ssid failed %d\n", err);
528	543
529	544	return err;
530	545	}
..	..	@@ -542,6 +557,7 @@
542	557	{
543	558	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
544	559	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
	560	+ struct brcmf_pub *drvr = cfg->pub;
545	561	struct brcmf_cfg80211_vif *vif;
546	562	int err;
547	563
..	..	@@ -567,7 +583,7 @@
567	583	BRCMF_VIF_EVENT_TIMEOUT);
568	584	brcmf_cfg80211_arm_vif_event(cfg, NULL);
569	585	if (!err) {
570		- brcmf_err("timeout occurred\n");
	586	+ bphy_err(drvr, "timeout occurred\n");
571	587	err = -EIO;
572	588	goto fail;
573	589	}
..	..	@@ -575,7 +591,7 @@
575	591	/* interface created in firmware */
576	592	ifp = vif->ifp;
577	593	if (!ifp) {
578		- brcmf_err("no if pointer provided\n");
	594	+ bphy_err(drvr, "no if pointer provided\n");
579	595	err = -ENOENT;
580	596	goto fail;
581	597	}
..	..	@@ -583,7 +599,7 @@
583	599	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
584	600	err = brcmf_net_attach(ifp, true);
585	601	if (err) {
586		- brcmf_err("Registering netdevice failed\n");
	602	+ bphy_err(drvr, "Registering netdevice failed\n");
587	603	free_netdev(ifp->ndev);
588	604	goto fail;
589	605	}
..	..	@@ -608,19 +624,97 @@
608	624	return vif->wdev.iftype == NL80211_IFTYPE_ADHOC;
609	625	}
610	626
	627	+/**
	628	+ * brcmf_mon_add_vif() - create monitor mode virtual interface
	629	+ *
	630	+ * @wiphy: wiphy device of new interface.
	631	+ * @name: name of the new interface.
	632	+ */
	633	+static struct wireless_dev brcmf_mon_add_vif(struct wiphy wiphy,
	634	+ const char *name)
	635	+{
	636	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	637	+ struct brcmf_cfg80211_vif *vif;
	638	+ struct net_device *ndev;
	639	+ struct brcmf_if *ifp;
	640	+ int err;
	641	+
	642	+ if (cfg->pub->mon_if) {
	643	+ err = -EEXIST;
	644	+ goto err_out;
	645	+ }
	646	+
	647	+ vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_MONITOR);
	648	+ if (IS_ERR(vif)) {
	649	+ err = PTR_ERR(vif);
	650	+ goto err_out;
	651	+ }
	652	+
	653	+ ndev = alloc_netdev(sizeof(*ifp), name, NET_NAME_UNKNOWN, ether_setup);
	654	+ if (!ndev) {
	655	+ err = -ENOMEM;
	656	+ goto err_free_vif;
	657	+ }
	658	+ ndev->type = ARPHRD_IEEE80211_RADIOTAP;
	659	+ ndev->ieee80211_ptr = &vif->wdev;
	660	+ ndev->needs_free_netdev = true;
	661	+ ndev->priv_destructor = brcmf_cfg80211_free_netdev;
	662	+ SET_NETDEV_DEV(ndev, wiphy_dev(cfg->wiphy));
	663	+
	664	+ ifp = netdev_priv(ndev);
	665	+ ifp->vif = vif;
	666	+ ifp->ndev = ndev;
	667	+ ifp->drvr = cfg->pub;
	668	+
	669	+ vif->ifp = ifp;
	670	+ vif->wdev.netdev = ndev;
	671	+
	672	+ err = brcmf_net_mon_attach(ifp);
	673	+ if (err) {
	674	+ brcmf_err("Failed to attach %s device\n", ndev->name);
	675	+ free_netdev(ndev);
	676	+ goto err_free_vif;
	677	+ }
	678	+
	679	+ cfg->pub->mon_if = ifp;
	680	+
	681	+ return &vif->wdev;
	682	+
	683	+err_free_vif:
	684	+ brcmf_free_vif(vif);
	685	+err_out:
	686	+ return ERR_PTR(err);
	687	+}
	688	+
	689	+static int brcmf_mon_del_vif(struct wiphy wiphy, struct wireless_dev wdev)
	690	+{
	691	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	692	+ struct net_device *ndev = wdev->netdev;
	693	+
	694	+ ndev->netdev_ops->ndo_stop(ndev);
	695	+
	696	+ brcmf_net_detach(ndev, true);
	697	+
	698	+ cfg->pub->mon_if = NULL;
	699	+
	700	+ return 0;
	701	+}
	702	+
611	703	static struct wireless_dev brcmf_cfg80211_add_iface(struct wiphy wiphy,
612	704	const char *name,
613	705	unsigned char name_assign_type,
614	706	enum nl80211_iftype type,
615	707	struct vif_params *params)
616	708	{
	709	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	710	+ struct brcmf_pub *drvr = cfg->pub;
617	711	struct wireless_dev *wdev;
618	712	int err;
619	713
620	714	brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
621	715	err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
622	716	if (err) {
623		- brcmf_err("iface validation failed: err=%d\n", err);
	717	+ bphy_err(drvr, "iface validation failed: err=%d\n", err);
624	718	return ERR_PTR(err);
625	719	}
626	720	switch (type) {
..	..	@@ -628,9 +722,10 @@
628	722	case NL80211_IFTYPE_STATION:
629	723	case NL80211_IFTYPE_AP_VLAN:
630	724	case NL80211_IFTYPE_WDS:
631		- case NL80211_IFTYPE_MONITOR:
632	725	case NL80211_IFTYPE_MESH_POINT:
633	726	return ERR_PTR(-EOPNOTSUPP);
	727	+ case NL80211_IFTYPE_MONITOR:
	728	+ return brcmf_mon_add_vif(wiphy, name);
634	729	case NL80211_IFTYPE_AP:
635	730	wdev = brcmf_ap_add_vif(wiphy, name, params);
636	731	break;
..	..	@@ -645,8 +740,8 @@
645	740	}
646	741
647	742	if (IS_ERR(wdev))
648		- brcmf_err("add iface %s type %d failed: err=%d\n",
649		- name, type, (int)PTR_ERR(wdev));
	743	+ bphy_err(drvr, "add iface %s type %d failed: err=%d\n", name,
	744	+ type, (int)PTR_ERR(wdev));
650	745	else
651	746	brcmf_cfg80211_update_proto_addr_mode(wdev);
652	747
..	..	@@ -661,12 +756,13 @@
661	756
662	757	void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
663	758	{
	759	+ struct brcmf_pub *drvr = ifp->drvr;
664	760	s32 err = 0;
665	761
666	762	if (check_vif_up(ifp->vif)) {
667	763	err = brcmf_fil_iovar_int_set(ifp, "mpc", mpc);
668	764	if (err) {
669		- brcmf_err("fail to set mpc\n");
	765	+ bphy_err(drvr, "fail to set mpc\n");
670	766	return;
671	767	}
672	768	brcmf_dbg(INFO, "MPC : %d\n", mpc);
..	..	@@ -677,6 +773,7 @@
677	773	struct brcmf_if *ifp, bool aborted,
678	774	bool fw_abort)
679	775	{
	776	+ struct brcmf_pub *drvr = cfg->pub;
680	777	struct brcmf_scan_params_le params_le;
681	778	struct cfg80211_scan_request *scan_request;
682	779	u64 reqid;
..	..	@@ -711,7 +808,7 @@
711	808	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,
712	809	&params_le, sizeof(params_le));
713	810	if (err)
714		- brcmf_err("Scan abort failed\n");
	811	+ bphy_err(drvr, "Scan abort failed\n");
715	812	}
716	813
717	814	brcmf_scan_config_mpc(ifp, 1);
..	..	@@ -756,6 +853,7 @@
756	853	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
757	854	struct net_device *ndev = wdev->netdev;
758	855	struct brcmf_if *ifp = netdev_priv(ndev);
	856	+ struct brcmf_pub *drvr = cfg->pub;
759	857	int ret;
760	858	int err;
761	859
..	..	@@ -763,7 +861,7 @@
763	861
764	862	err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
765	863	if (err) {
766		- brcmf_err("interface_remove failed %d\n", err);
	864	+ bphy_err(drvr, "interface_remove failed %d\n", err);
767	865	goto err_unarm;
768	866	}
769	867
..	..	@@ -771,7 +869,7 @@
771	869	ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
772	870	BRCMF_VIF_EVENT_TIMEOUT);
773	871	if (!ret) {
774		- brcmf_err("timeout occurred\n");
	872	+ bphy_err(drvr, "timeout occurred\n");
775	873	err = -EIO;
776	874	goto err_unarm;
777	875	}
..	..	@@ -810,9 +908,10 @@
810	908	case NL80211_IFTYPE_STATION:
811	909	case NL80211_IFTYPE_AP_VLAN:
812	910	case NL80211_IFTYPE_WDS:
813		- case NL80211_IFTYPE_MONITOR:
814	911	case NL80211_IFTYPE_MESH_POINT:
815	912	return -EOPNOTSUPP;
	913	+ case NL80211_IFTYPE_MONITOR:
	914	+ return brcmf_mon_del_vif(wiphy, wdev);
816	915	case NL80211_IFTYPE_AP:
817	916	return brcmf_cfg80211_del_ap_iface(wiphy, wdev);
818	917	case NL80211_IFTYPE_P2P_CLIENT:
..	..	@@ -834,6 +933,7 @@
834	933	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
835	934	struct brcmf_if *ifp = netdev_priv(ndev);
836	935	struct brcmf_cfg80211_vif *vif = ifp->vif;
	936	+ struct brcmf_pub *drvr = cfg->pub;
837	937	s32 infra = 0;
838	938	s32 ap = 0;
839	939	s32 err = 0;
..	..	@@ -873,14 +973,14 @@
873	973	}
874	974	err = brcmf_vif_change_validate(wiphy_to_cfg(wiphy), vif, type);
875	975	if (err) {
876		- brcmf_err("iface validation failed: err=%d\n", err);
	976	+ bphy_err(drvr, "iface validation failed: err=%d\n", err);
877	977	return err;
878	978	}
879	979	switch (type) {
880	980	case NL80211_IFTYPE_MONITOR:
881	981	case NL80211_IFTYPE_WDS:
882		- brcmf_err("type (%d) : currently we do not support this type\n",
883		- type);
	982	+ bphy_err(drvr, "type (%d) : currently we do not support this type\n",
	983	+ type);
884	984	return -EOPNOTSUPP;
885	985	case NL80211_IFTYPE_ADHOC:
886	986	infra = 0;
..	..	@@ -908,7 +1008,7 @@
908	1008	} else {
909	1009	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, infra);
910	1010	if (err) {
911		- brcmf_err("WLC_SET_INFRA error (%d)\n", err);
	1011	+ bphy_err(drvr, "WLC_SET_INFRA error (%d)\n", err);
912	1012	err = -EAGAIN;
913	1013	goto done;
914	1014	}
..	..	@@ -999,6 +1099,7 @@
999	1099	brcmf_run_escan(struct brcmf_cfg80211_info cfg, struct brcmf_if ifp,
1000	1100	struct cfg80211_scan_request *request)
1001	1101	{
	1102	+ struct brcmf_pub *drvr = cfg->pub;
1002	1103	s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
1003	1104	offsetof(struct brcmf_escan_params_le, params_le);
1004	1105	struct brcmf_escan_params_le *params;
..	..	@@ -1030,7 +1131,7 @@
1030	1131	if (err == -EBUSY)
1031	1132	brcmf_dbg(INFO, "system busy : escan canceled\n");
1032	1133	else
1033		- brcmf_err("error (%d)\n", err);
	1134	+ bphy_err(drvr, "error (%d)\n", err);
1034	1135	}
1035	1136
1036	1137	kfree(params);
..	..	@@ -1067,6 +1168,7 @@
1067	1168	brcmf_cfg80211_scan(struct wiphy wiphy, struct cfg80211_scan_request request)
1068	1169	{
1069	1170	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	1171	+ struct brcmf_pub *drvr = cfg->pub;
1070	1172	struct brcmf_cfg80211_vif *vif;
1071	1173	s32 err = 0;
1072	1174
..	..	@@ -1076,21 +1178,22 @@
1076	1178	return -EIO;
1077	1179
1078	1180	if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
1079		- brcmf_err("Scanning already: status (%lu)\n", cfg->scan_status);
	1181	+ bphy_err(drvr, "Scanning already: status (%lu)\n",
	1182	+ cfg->scan_status);
1080	1183	return -EAGAIN;
1081	1184	}
1082	1185	if (test_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status)) {
1083		- brcmf_err("Scanning being aborted: status (%lu)\n",
1084		- cfg->scan_status);
	1186	+ bphy_err(drvr, "Scanning being aborted: status (%lu)\n",
	1187	+ cfg->scan_status);
1085	1188	return -EAGAIN;
1086	1189	}
1087	1190	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
1088		- brcmf_err("Scanning suppressed: status (%lu)\n",
1089		- cfg->scan_status);
	1191	+ bphy_err(drvr, "Scanning suppressed: status (%lu)\n",
	1192	+ cfg->scan_status);
1090	1193	return -EAGAIN;
1091	1194	}
1092	1195	if (test_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state)) {
1093		- brcmf_err("Connecting: status (%lu)\n", vif->sme_state);
	1196	+ bphy_err(drvr, "Connecting: status (%lu)\n", vif->sme_state);
1094	1197	return -EAGAIN;
1095	1198	}
1096	1199
..	..	@@ -1124,7 +1227,7 @@
1124	1227	return 0;
1125	1228
1126	1229	scan_out:
1127		- brcmf_err("scan error (%d)\n", err);
	1230	+ bphy_err(drvr, "scan error (%d)\n", err);
1128	1231	clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
1129	1232	cfg->scan_request = NULL;
1130	1233	return err;
..	..	@@ -1132,36 +1235,41 @@
1132	1235
1133	1236	static s32 brcmf_set_rts(struct net_device *ndev, u32 rts_threshold)
1134	1237	{
	1238	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1239	+ struct brcmf_pub *drvr = ifp->drvr;
1135	1240	s32 err = 0;
1136	1241
1137		- err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "rtsthresh",
1138		- rts_threshold);
	1242	+ err = brcmf_fil_iovar_int_set(ifp, "rtsthresh", rts_threshold);
1139	1243	if (err)
1140		- brcmf_err("Error (%d)\n", err);
	1244	+ bphy_err(drvr, "Error (%d)\n", err);
1141	1245
1142	1246	return err;
1143	1247	}
1144	1248
1145	1249	static s32 brcmf_set_frag(struct net_device *ndev, u32 frag_threshold)
1146	1250	{
	1251	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1252	+ struct brcmf_pub *drvr = ifp->drvr;
1147	1253	s32 err = 0;
1148	1254
1149		- err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "fragthresh",
	1255	+ err = brcmf_fil_iovar_int_set(ifp, "fragthresh",
1150	1256	frag_threshold);
1151	1257	if (err)
1152		- brcmf_err("Error (%d)\n", err);
	1258	+ bphy_err(drvr, "Error (%d)\n", err);
1153	1259
1154	1260	return err;
1155	1261	}
1156	1262
1157	1263	static s32 brcmf_set_retry(struct net_device *ndev, u32 retry, bool l)
1158	1264	{
	1265	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1266	+ struct brcmf_pub *drvr = ifp->drvr;
1159	1267	s32 err = 0;
1160	1268	u32 cmd = (l ? BRCMF_C_SET_LRL : BRCMF_C_SET_SRL);
1161	1269
1162		- err = brcmf_fil_cmd_int_set(netdev_priv(ndev), cmd, retry);
	1270	+ err = brcmf_fil_cmd_int_set(ifp, cmd, retry);
1163	1271	if (err) {
1164		- brcmf_err("cmd (%d) , error (%d)\n", cmd, err);
	1272	+ bphy_err(drvr, "cmd (%d) , error (%d)\n", cmd, err);
1165	1273	return err;
1166	1274	}
1167	1275	return err;
..	..	@@ -1237,6 +1345,7 @@
1237	1345
1238	1346	static int brcmf_set_pmk(struct brcmf_if ifp, const u8 pmk_data, u16 pmk_len)
1239	1347	{
	1348	+ struct brcmf_pub *drvr = ifp->drvr;
1240	1349	struct brcmf_wsec_pmk_le pmk;
1241	1350	int i, err;
1242	1351
..	..	@@ -1250,36 +1359,68 @@
1250	1359	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK,
1251	1360	&pmk, sizeof(pmk));
1252	1361	if (err < 0)
1253		- brcmf_err("failed to change PSK in firmware (len=%u)\n",
1254		- pmk_len);
	1362	+ bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n",
	1363	+ pmk_len);
1255	1364
1256	1365	return err;
1257	1366	}
1258	1367
1259		-static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
	1368	+static int brcmf_set_sae_password(struct brcmf_if ifp, const u8 pwd_data,
	1369	+ u16 pwd_len)
	1370	+{
	1371	+ struct brcmf_pub *drvr = ifp->drvr;
	1372	+ struct brcmf_wsec_sae_pwd_le sae_pwd;
	1373	+ int err;
	1374	+
	1375	+ if (pwd_len > BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) {
	1376	+ bphy_err(drvr, "sae_password must be less than %d\n",
	1377	+ BRCMF_WSEC_MAX_SAE_PASSWORD_LEN);
	1378	+ return -EINVAL;
	1379	+ }
	1380	+
	1381	+ sae_pwd.key_len = cpu_to_le16(pwd_len);
	1382	+ memcpy(sae_pwd.key, pwd_data, pwd_len);
	1383	+
	1384	+ err = brcmf_fil_iovar_data_set(ifp, "sae_password", &sae_pwd,
	1385	+ sizeof(sae_pwd));
	1386	+ if (err < 0)
	1387	+ bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n",
	1388	+ pwd_len);
	1389	+
	1390	+ return err;
	1391	+}
	1392	+
	1393	+static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,
	1394	+ bool locally_generated)
1260	1395	{
1261	1396	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(vif->wdev.wiphy);
	1397	+ struct brcmf_pub *drvr = cfg->pub;
	1398	+ bool bus_up = drvr->bus_if->state == BRCMF_BUS_UP;
1262	1399	s32 err = 0;
1263	1400
1264	1401	brcmf_dbg(TRACE, "Enter\n");
1265	1402
1266	1403	if (test_and_clear_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state)) {
1267		- brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n");
1268		- err = brcmf_fil_cmd_data_set(vif->ifp,
1269		- BRCMF_C_DISASSOC, NULL, 0);
1270		- if (err) {
1271		- brcmf_err("WLC_DISASSOC failed (%d)\n", err);
	1404	+ if (bus_up) {
	1405	+ brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n");
	1406	+ err = brcmf_fil_cmd_data_set(vif->ifp,
	1407	+ BRCMF_C_DISASSOC, NULL, 0);
	1408	+ if (err)
	1409	+ bphy_err(drvr, "WLC_DISASSOC failed (%d)\n",
	1410	+ err);
1272	1411	}
	1412	+
1273	1413	if ((vif->wdev.iftype == NL80211_IFTYPE_STATION) \|\|
1274	1414	(vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT))
1275	1415	cfg80211_disconnected(vif->wdev.netdev, reason, NULL, 0,
1276		- true, GFP_KERNEL);
	1416	+ locally_generated, GFP_KERNEL);
1277	1417	}
1278	1418	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);
1279	1419	clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
1280	1420	brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_ENABLED, 0);
1281	1421	if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_NONE) {
1282		- brcmf_set_pmk(vif->ifp, NULL, 0);
	1422	+ if (bus_up)
	1423	+ brcmf_set_pmk(vif->ifp, NULL, 0);
1283	1424	vif->profile.use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
1284	1425	}
1285	1426	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -1292,6 +1433,7 @@
1292	1433	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
1293	1434	struct brcmf_if *ifp = netdev_priv(ndev);
1294	1435	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	1436	+ struct brcmf_pub *drvr = cfg->pub;
1295	1437	struct brcmf_join_params join_params;
1296	1438	size_t join_params_size = 0;
1297	1439	s32 err = 0;
..	..	@@ -1356,7 +1498,7 @@
1356	1498
1357	1499	err = brcmf_fil_iovar_int_set(ifp, "wsec", wsec);
1358	1500	if (err) {
1359		- brcmf_err("wsec failed (%d)\n", err);
	1501	+ bphy_err(drvr, "wsec failed (%d)\n", err);
1360	1502	goto done;
1361	1503	}
1362	1504
..	..	@@ -1368,7 +1510,7 @@
1368	1510
1369	1511	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD, bcnprd);
1370	1512	if (err) {
1371		- brcmf_err("WLC_SET_BCNPRD failed (%d)\n", err);
	1513	+ bphy_err(drvr, "WLC_SET_BCNPRD failed (%d)\n", err);
1372	1514	goto done;
1373	1515	}
1374	1516
..	..	@@ -1413,7 +1555,7 @@
1413	1555	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_CHANNEL,
1414	1556	target_channel);
1415	1557	if (err) {
1416		- brcmf_err("WLC_SET_CHANNEL failed (%d)\n", err);
	1558	+ bphy_err(drvr, "WLC_SET_CHANNEL failed (%d)\n", err);
1417	1559	goto done;
1418	1560	}
1419	1561	} else
..	..	@@ -1425,7 +1567,7 @@
1425	1567	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
1426	1568	&join_params, join_params_size);
1427	1569	if (err) {
1428		- brcmf_err("WLC_SET_SSID failed (%d)\n", err);
	1570	+ bphy_err(drvr, "WLC_SET_SSID failed (%d)\n", err);
1429	1571	goto done;
1430	1572	}
1431	1573
..	..	@@ -1450,7 +1592,7 @@
1450	1592	return 0;
1451	1593	}
1452	1594
1453		- brcmf_link_down(ifp->vif, WLAN_REASON_DEAUTH_LEAVING);
	1595	+ brcmf_link_down(ifp->vif, WLAN_REASON_DEAUTH_LEAVING, true);
1454	1596	brcmf_net_setcarrier(ifp, false);
1455	1597
1456	1598	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -1461,7 +1603,9 @@
1461	1603	static s32 brcmf_set_wpa_version(struct net_device *ndev,
1462	1604	struct cfg80211_connect_params *sme)
1463	1605	{
	1606	+ struct brcmf_if *ifp = netdev_priv(ndev);
1464	1607	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1608	+ struct brcmf_pub *drvr = ifp->drvr;
1465	1609	struct brcmf_cfg80211_security *sec;
1466	1610	s32 val = 0;
1467	1611	s32 err = 0;
..	..	@@ -1470,12 +1614,14 @@
1470	1614	val = WPA_AUTH_PSK \| WPA_AUTH_UNSPECIFIED;
1471	1615	else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)
1472	1616	val = WPA2_AUTH_PSK \| WPA2_AUTH_UNSPECIFIED;
	1617	+ else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_3)
	1618	+ val = WPA3_AUTH_SAE_PSK;
1473	1619	else
1474	1620	val = WPA_AUTH_DISABLED;
1475	1621	brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);
1476		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
	1622	+ err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", val);
1477	1623	if (err) {
1478		- brcmf_err("set wpa_auth failed (%d)\n", err);
	1624	+ bphy_err(drvr, "set wpa_auth failed (%d)\n", err);
1479	1625	return err;
1480	1626	}
1481	1627	sec = &profile->sec;
..	..	@@ -1486,7 +1632,9 @@
1486	1632	static s32 brcmf_set_auth_type(struct net_device *ndev,
1487	1633	struct cfg80211_connect_params *sme)
1488	1634	{
	1635	+ struct brcmf_if *ifp = netdev_priv(ndev);
1489	1636	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1637	+ struct brcmf_pub *drvr = ifp->drvr;
1490	1638	struct brcmf_cfg80211_security *sec;
1491	1639	s32 val = 0;
1492	1640	s32 err = 0;
..	..	@@ -1500,15 +1648,19 @@
1500	1648	val = 1;
1501	1649	brcmf_dbg(CONN, "shared key\n");
1502	1650	break;
	1651	+ case NL80211_AUTHTYPE_SAE:
	1652	+ val = 3;
	1653	+ brcmf_dbg(CONN, "SAE authentication\n");
	1654	+ break;
1503	1655	default:
1504	1656	val = 2;
1505	1657	brcmf_dbg(CONN, "automatic, auth type (%d)\n", sme->auth_type);
1506	1658	break;
1507	1659	}
1508	1660
1509		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
	1661	+ err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
1510	1662	if (err) {
1511		- brcmf_err("set auth failed (%d)\n", err);
	1663	+ bphy_err(drvr, "set auth failed (%d)\n", err);
1512	1664	return err;
1513	1665	}
1514	1666	sec = &profile->sec;
..	..	@@ -1520,7 +1672,9 @@
1520	1672	brcmf_set_wsec_mode(struct net_device *ndev,
1521	1673	struct cfg80211_connect_params *sme)
1522	1674	{
	1675	+ struct brcmf_if *ifp = netdev_priv(ndev);
1523	1676	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1677	+ struct brcmf_pub *drvr = ifp->drvr;
1524	1678	struct brcmf_cfg80211_security *sec;
1525	1679	s32 pval = 0;
1526	1680	s32 gval = 0;
..	..	@@ -1543,8 +1697,8 @@
1543	1697	pval = AES_ENABLED;
1544	1698	break;
1545	1699	default:
1546		- brcmf_err("invalid cipher pairwise (%d)\n",
1547		- sme->crypto.ciphers_pairwise[0]);
	1700	+ bphy_err(drvr, "invalid cipher pairwise (%d)\n",
	1701	+ sme->crypto.ciphers_pairwise[0]);
1548	1702	return -EINVAL;
1549	1703	}
1550	1704	}
..	..	@@ -1564,8 +1718,8 @@
1564	1718	gval = AES_ENABLED;
1565	1719	break;
1566	1720	default:
1567		- brcmf_err("invalid cipher group (%d)\n",
1568		- sme->crypto.cipher_group);
	1721	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1722	+ sme->crypto.cipher_group);
1569	1723	return -EINVAL;
1570	1724	}
1571	1725	}
..	..	@@ -1578,9 +1732,9 @@
1578	1732	pval = AES_ENABLED;
1579	1733
1580	1734	wsec = pval \| gval;
1581		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", wsec);
	1735	+ err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
1582	1736	if (err) {
1583		- brcmf_err("error (%d)\n", err);
	1737	+ bphy_err(drvr, "error (%d)\n", err);
1584	1738	return err;
1585	1739	}
1586	1740
..	..	@@ -1596,6 +1750,7 @@
1596	1750	{
1597	1751	struct brcmf_if *ifp = netdev_priv(ndev);
1598	1752	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	1753	+ struct brcmf_pub *drvr = ifp->drvr;
1599	1754	s32 val;
1600	1755	s32 err;
1601	1756	const struct brcmf_tlv *rsn_ie;
..	..	@@ -1607,13 +1762,14 @@
1607	1762	u16 count;
1608	1763
1609	1764	profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
	1765	+ profile->is_ft = false;
1610	1766
1611	1767	if (!sme->crypto.n_akm_suites)
1612	1768	return 0;
1613	1769
1614	1770	err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &val);
1615	1771	if (err) {
1616		- brcmf_err("could not get wpa_auth (%d)\n", err);
	1772	+ bphy_err(drvr, "could not get wpa_auth (%d)\n", err);
1617	1773	return err;
1618	1774	}
1619	1775	if (val & (WPA_AUTH_PSK \| WPA_AUTH_UNSPECIFIED)) {
..	..	@@ -1627,8 +1783,8 @@
1627	1783	val = WPA_AUTH_PSK;
1628	1784	break;
1629	1785	default:
1630		- brcmf_err("invalid cipher group (%d)\n",
1631		- sme->crypto.cipher_group);
	1786	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1787	+ sme->crypto.cipher_group);
1632	1788	return -EINVAL;
1633	1789	}
1634	1790	} else if (val & (WPA2_AUTH_PSK \| WPA2_AUTH_UNSPECIFIED)) {
..	..	@@ -1649,9 +1805,33 @@
1649	1805	case WLAN_AKM_SUITE_PSK:
1650	1806	val = WPA2_AUTH_PSK;
1651	1807	break;
	1808	+ case WLAN_AKM_SUITE_FT_8021X:
	1809	+ val = WPA2_AUTH_UNSPECIFIED \| WPA2_AUTH_FT;
	1810	+ profile->is_ft = true;
	1811	+ if (sme->want_1x)
	1812	+ profile->use_fwsup = BRCMF_PROFILE_FWSUP_1X;
	1813	+ break;
	1814	+ case WLAN_AKM_SUITE_FT_PSK:
	1815	+ val = WPA2_AUTH_PSK \| WPA2_AUTH_FT;
	1816	+ profile->is_ft = true;
	1817	+ break;
1652	1818	default:
1653		- brcmf_err("invalid cipher group (%d)\n",
1654		- sme->crypto.cipher_group);
	1819	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1820	+ sme->crypto.cipher_group);
	1821	+ return -EINVAL;
	1822	+ }
	1823	+ } else if (val & WPA3_AUTH_SAE_PSK) {
	1824	+ switch (sme->crypto.akm_suites[0]) {
	1825	+ case WLAN_AKM_SUITE_SAE:
	1826	+ val = WPA3_AUTH_SAE_PSK;
	1827	+ if (sme->crypto.sae_pwd) {
	1828	+ brcmf_dbg(INFO, "using SAE offload\n");
	1829	+ profile->use_fwsup = BRCMF_PROFILE_FWSUP_SAE;
	1830	+ }
	1831	+ break;
	1832	+ default:
	1833	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1834	+ sme->crypto.cipher_group);
1655	1835	return -EINVAL;
1656	1836	}
1657	1837	}
..	..	@@ -1697,7 +1877,7 @@
1697	1877	brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
1698	1878	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
1699	1879	if (err) {
1700		- brcmf_err("could not set wpa_auth (%d)\n", err);
	1880	+ bphy_err(drvr, "could not set wpa_auth (%d)\n", err);
1701	1881	return err;
1702	1882	}
1703	1883
..	..	@@ -1708,6 +1888,8 @@
1708	1888	brcmf_set_sharedkey(struct net_device *ndev,
1709	1889	struct cfg80211_connect_params *sme)
1710	1890	{
	1891	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1892	+ struct brcmf_pub *drvr = ifp->drvr;
1711	1893	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
1712	1894	struct brcmf_cfg80211_security *sec;
1713	1895	struct brcmf_wsec_key key;
..	..	@@ -1723,7 +1905,8 @@
1723	1905	brcmf_dbg(CONN, "wpa_versions 0x%x cipher_pairwise 0x%x\n",
1724	1906	sec->wpa_versions, sec->cipher_pairwise);
1725	1907
1726		- if (sec->wpa_versions & (NL80211_WPA_VERSION_1 \| NL80211_WPA_VERSION_2))
	1908	+ if (sec->wpa_versions & (NL80211_WPA_VERSION_1 \| NL80211_WPA_VERSION_2 \|
	1909	+ NL80211_WPA_VERSION_3))
1727	1910	return 0;
1728	1911
1729	1912	if (!(sec->cipher_pairwise &
..	..	@@ -1734,7 +1917,7 @@
1734	1917	key.len = (u32) sme->key_len;
1735	1918	key.index = (u32) sme->key_idx;
1736	1919	if (key.len > sizeof(key.data)) {
1737		- brcmf_err("Too long key length (%u)\n", key.len);
	1920	+ bphy_err(drvr, "Too long key length (%u)\n", key.len);
1738	1921	return -EINVAL;
1739	1922	}
1740	1923	memcpy(key.data, sme->key, key.len);
..	..	@@ -1747,24 +1930,24 @@
1747	1930	key.algo = CRYPTO_ALGO_WEP128;
1748	1931	break;
1749	1932	default:
1750		- brcmf_err("Invalid algorithm (%d)\n",
1751		- sme->crypto.ciphers_pairwise[0]);
	1933	+ bphy_err(drvr, "Invalid algorithm (%d)\n",
	1934	+ sme->crypto.ciphers_pairwise[0]);
1752	1935	return -EINVAL;
1753	1936	}
1754	1937	/* Set the new key/index */
1755	1938	brcmf_dbg(CONN, "key length (%d) key index (%d) algo (%d)\n",
1756	1939	key.len, key.index, key.algo);
1757	1940	brcmf_dbg(CONN, "key \"%s\"\n", key.data);
1758		- err = send_key_to_dongle(netdev_priv(ndev), &key);
	1941	+ err = send_key_to_dongle(ifp, &key);
1759	1942	if (err)
1760	1943	return err;
1761	1944
1762	1945	if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {
1763	1946	brcmf_dbg(CONN, "set auth_type to shared key\n");
1764	1947	val = WL_AUTH_SHARED_KEY; /* shared key */
1765		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
	1948	+ err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
1766	1949	if (err)
1767		- brcmf_err("set auth failed (%d)\n", err);
	1950	+ bphy_err(drvr, "set auth failed (%d)\n", err);
1768	1951	}
1769	1952	return err;
1770	1953	}
..	..	@@ -1784,6 +1967,7 @@
1784	1967	static void brcmf_set_join_pref(struct brcmf_if *ifp,
1785	1968	struct cfg80211_bss_selection *bss_select)
1786	1969	{
	1970	+ struct brcmf_pub *drvr = ifp->drvr;
1787	1971	struct brcmf_join_pref_params join_pref_params[2];
1788	1972	enum nl80211_band band;
1789	1973	int err, i = 0;
..	..	@@ -1822,7 +2006,7 @@
1822	2006	err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
1823	2007	sizeof(join_pref_params));
1824	2008	if (err)
1825		- brcmf_err("Set join_pref error (%d)\n", err);
	2009	+ bphy_err(drvr, "Set join_pref error (%d)\n", err);
1826	2010	}
1827	2011
1828	2012	static s32
..	..	@@ -1833,6 +2017,7 @@
1833	2017	struct brcmf_if *ifp = netdev_priv(ndev);
1834	2018	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
1835	2019	struct ieee80211_channel *chan = sme->channel;
	2020	+ struct brcmf_pub *drvr = ifp->drvr;
1836	2021	struct brcmf_join_params join_params;
1837	2022	size_t join_params_size;
1838	2023	const struct brcmf_tlv *rsn_ie;
..	..	@@ -1849,7 +2034,7 @@
1849	2034	return -EIO;
1850	2035
1851	2036	if (!sme->ssid) {
1852		- brcmf_err("Invalid ssid\n");
	2037	+ bphy_err(drvr, "Invalid ssid\n");
1853	2038	return -EOPNOTSUPP;
1854	2039	}
1855	2040
..	..	@@ -1878,7 +2063,7 @@
1878	2063	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
1879	2064	sme->ie, sme->ie_len);
1880	2065	if (err)
1881		- brcmf_err("Set Assoc REQ IE Failed\n");
	2066	+ bphy_err(drvr, "Set Assoc REQ IE Failed\n");
1882	2067	else
1883	2068	brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
1884	2069
..	..	@@ -1899,36 +2084,37 @@
1899	2084
1900	2085	err = brcmf_set_wpa_version(ndev, sme);
1901	2086	if (err) {
1902		- brcmf_err("wl_set_wpa_version failed (%d)\n", err);
	2087	+ bphy_err(drvr, "wl_set_wpa_version failed (%d)\n", err);
1903	2088	goto done;
1904	2089	}
1905	2090
1906	2091	sme->auth_type = brcmf_war_auth_type(ifp, sme->auth_type);
1907	2092	err = brcmf_set_auth_type(ndev, sme);
1908	2093	if (err) {
1909		- brcmf_err("wl_set_auth_type failed (%d)\n", err);
	2094	+ bphy_err(drvr, "wl_set_auth_type failed (%d)\n", err);
1910	2095	goto done;
1911	2096	}
1912	2097
1913	2098	err = brcmf_set_wsec_mode(ndev, sme);
1914	2099	if (err) {
1915		- brcmf_err("wl_set_set_cipher failed (%d)\n", err);
	2100	+ bphy_err(drvr, "wl_set_set_cipher failed (%d)\n", err);
1916	2101	goto done;
1917	2102	}
1918	2103
1919	2104	err = brcmf_set_key_mgmt(ndev, sme);
1920	2105	if (err) {
1921		- brcmf_err("wl_set_key_mgmt failed (%d)\n", err);
	2106	+ bphy_err(drvr, "wl_set_key_mgmt failed (%d)\n", err);
1922	2107	goto done;
1923	2108	}
1924	2109
1925	2110	err = brcmf_set_sharedkey(ndev, sme);
1926	2111	if (err) {
1927		- brcmf_err("brcmf_set_sharedkey failed (%d)\n", err);
	2112	+ bphy_err(drvr, "brcmf_set_sharedkey failed (%d)\n", err);
1928	2113	goto done;
1929	2114	}
1930	2115
1931		- if (sme->crypto.psk) {
	2116	+ if (sme->crypto.psk &&
	2117	+ profile->use_fwsup != BRCMF_PROFILE_FWSUP_SAE) {
1932	2118	if (WARN_ON(profile->use_fwsup != BRCMF_PROFILE_FWSUP_NONE)) {
1933	2119	err = -EINVAL;
1934	2120	goto done;
..	..	@@ -1941,17 +2127,29 @@
1941	2127	/* enable firmware supplicant for this interface */
1942	2128	err = brcmf_fil_iovar_int_set(ifp, "sup_wpa", 1);
1943	2129	if (err < 0) {
1944		- brcmf_err("failed to enable fw supplicant\n");
	2130	+ bphy_err(drvr, "failed to enable fw supplicant\n");
1945	2131	goto done;
1946	2132	}
1947	2133	}
1948	2134
1949		- if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_PSK) {
	2135	+ if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_PSK)
1950	2136	err = brcmf_set_pmk(ifp, sme->crypto.psk,
1951	2137	BRCMF_WSEC_MAX_PSK_LEN);
1952		- if (err)
	2138	+ else if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_SAE) {
	2139	+ /* clean up user-space RSNE */
	2140	+ err = brcmf_fil_iovar_data_set(ifp, "wpaie", NULL, 0);
	2141	+ if (err) {
	2142	+ bphy_err(drvr, "failed to clean up user-space RSNE\n");
1953	2143	goto done;
	2144	+ }
	2145	+ err = brcmf_set_sae_password(ifp, sme->crypto.sae_pwd,
	2146	+ sme->crypto.sae_pwd_len);
	2147	+ if (!err && sme->crypto.psk)
	2148	+ err = brcmf_set_pmk(ifp, sme->crypto.psk,
	2149	+ BRCMF_WSEC_MAX_PSK_LEN);
1954	2150	}
	2151	+ if (err)
	2152	+ goto done;
1955	2153
1956	2154	/* Join with specific BSSID and cached SSID
1957	2155	* If SSID is zero join based on BSSID only
..	..	@@ -2036,7 +2234,7 @@
2036	2234	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
2037	2235	&join_params, join_params_size);
2038	2236	if (err)
2039		- brcmf_err("BRCMF_C_SET_SSID failed (%d)\n", err);
	2237	+ bphy_err(drvr, "BRCMF_C_SET_SSID failed (%d)\n", err);
2040	2238
2041	2239	done:
2042	2240	if (err)
..	..	@@ -2049,8 +2247,10 @@
2049	2247	brcmf_cfg80211_disconnect(struct wiphy wiphy, struct net_device ndev,
2050	2248	u16 reason_code)
2051	2249	{
	2250	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2052	2251	struct brcmf_if *ifp = netdev_priv(ndev);
2053	2252	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	2253	+ struct brcmf_pub *drvr = cfg->pub;
2054	2254	struct brcmf_scb_val_le scbval;
2055	2255	s32 err = 0;
2056	2256
..	..	@@ -2067,7 +2267,7 @@
2067	2267	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_DISASSOC,
2068	2268	&scbval, sizeof(scbval));
2069	2269	if (err)
2070		- brcmf_err("error (%d)\n", err);
	2270	+ bphy_err(drvr, "error (%d)\n", err);
2071	2271
2072	2272	brcmf_dbg(TRACE, "Exit\n");
2073	2273	return err;
..	..	@@ -2080,6 +2280,7 @@
2080	2280	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2081	2281	struct net_device *ndev = cfg_to_ndev(cfg);
2082	2282	struct brcmf_if *ifp = netdev_priv(ndev);
	2283	+ struct brcmf_pub *drvr = cfg->pub;
2083	2284	s32 err;
2084	2285	s32 disable;
2085	2286	u32 qdbm = 127;
..	..	@@ -2094,7 +2295,7 @@
2094	2295	case NL80211_TX_POWER_LIMITED:
2095	2296	case NL80211_TX_POWER_FIXED:
2096	2297	if (mbm < 0) {
2097		- brcmf_err("TX_POWER_FIXED - dbm is negative\n");
	2298	+ bphy_err(drvr, "TX_POWER_FIXED - dbm is negative\n");
2098	2299	err = -EINVAL;
2099	2300	goto done;
2100	2301	}
..	..	@@ -2104,7 +2305,7 @@
2104	2305	qdbm \|= WL_TXPWR_OVERRIDE;
2105	2306	break;
2106	2307	default:
2107		- brcmf_err("Unsupported type %d\n", type);
	2308	+ bphy_err(drvr, "Unsupported type %d\n", type);
2108	2309	err = -EINVAL;
2109	2310	goto done;
2110	2311	}
..	..	@@ -2112,11 +2313,11 @@
2112	2313	disable = WL_RADIO_SW_DISABLE << 16;
2113	2314	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_RADIO, disable);
2114	2315	if (err)
2115		- brcmf_err("WLC_SET_RADIO error (%d)\n", err);
	2316	+ bphy_err(drvr, "WLC_SET_RADIO error (%d)\n", err);
2116	2317
2117	2318	err = brcmf_fil_iovar_int_set(ifp, "qtxpower", qdbm);
2118	2319	if (err)
2119		- brcmf_err("qtxpower error (%d)\n", err);
	2320	+ bphy_err(drvr, "qtxpower error (%d)\n", err);
2120	2321
2121	2322	done:
2122	2323	brcmf_dbg(TRACE, "Exit %d (qdbm)\n", qdbm & ~WL_TXPWR_OVERRIDE);
..	..	@@ -2127,7 +2328,9 @@
2127	2328	brcmf_cfg80211_get_tx_power(struct wiphy wiphy, struct wireless_dev wdev,
2128	2329	s32 *dbm)
2129	2330	{
	2331	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2130	2332	struct brcmf_cfg80211_vif *vif = wdev_to_vif(wdev);
	2333	+ struct brcmf_pub *drvr = cfg->pub;
2131	2334	s32 qdbm = 0;
2132	2335	s32 err;
2133	2336
..	..	@@ -2137,7 +2340,7 @@
2137	2340
2138	2341	err = brcmf_fil_iovar_int_get(vif->ifp, "qtxpower", &qdbm);
2139	2342	if (err) {
2140		- brcmf_err("error (%d)\n", err);
	2343	+ bphy_err(drvr, "error (%d)\n", err);
2141	2344	goto done;
2142	2345	}
2143	2346	*dbm = (qdbm & ~WL_TXPWR_OVERRIDE) / 4;
..	..	@@ -2152,6 +2355,7 @@
2152	2355	u8 key_idx, bool unicast, bool multicast)
2153	2356	{
2154	2357	struct brcmf_if *ifp = netdev_priv(ndev);
	2358	+ struct brcmf_pub *drvr = ifp->drvr;
2155	2359	u32 index;
2156	2360	u32 wsec;
2157	2361	s32 err = 0;
..	..	@@ -2163,7 +2367,7 @@
2163	2367
2164	2368	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2165	2369	if (err) {
2166		- brcmf_err("WLC_GET_WSEC error (%d)\n", err);
	2370	+ bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
2167	2371	goto done;
2168	2372	}
2169	2373
..	..	@@ -2173,7 +2377,7 @@
2173	2377	err = brcmf_fil_cmd_int_set(ifp,
2174	2378	BRCMF_C_SET_KEY_PRIMARY, index);
2175	2379	if (err)
2176		- brcmf_err("error (%d)\n", err);
	2380	+ bphy_err(drvr, "error (%d)\n", err);
2177	2381	}
2178	2382	done:
2179	2383	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -2222,7 +2426,9 @@
2222	2426	u8 key_idx, bool pairwise, const u8 *mac_addr,
2223	2427	struct key_params *params)
2224	2428	{
	2429	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2225	2430	struct brcmf_if *ifp = netdev_priv(ndev);
	2431	+ struct brcmf_pub *drvr = cfg->pub;
2226	2432	struct brcmf_wsec_key *key;
2227	2433	s32 val;
2228	2434	s32 wsec;
..	..	@@ -2237,7 +2443,7 @@
2237	2443
2238	2444	if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
2239	2445	/* we ignore this key index in this case */
2240		- brcmf_err("invalid key index (%d)\n", key_idx);
	2446	+ bphy_err(drvr, "invalid key index (%d)\n", key_idx);
2241	2447	return -EINVAL;
2242	2448	}
2243	2449
..	..	@@ -2246,7 +2452,7 @@
2246	2452	mac_addr);
2247	2453
2248	2454	if (params->key_len > sizeof(key->data)) {
2249		- brcmf_err("Too long key length (%u)\n", params->key_len);
	2455	+ bphy_err(drvr, "Too long key length (%u)\n", params->key_len);
2250	2456	return -EINVAL;
2251	2457	}
2252	2458
..	..	@@ -2266,6 +2472,17 @@
2266	2472	memcpy(key->data, params->key, key->len);
2267	2473	if (!ext_key)
2268	2474	key->flags = BRCMF_PRIMARY_KEY;
	2475	+
	2476	+ if (params->seq && params->seq_len == 6) {
	2477	+ /* rx iv */
	2478	+ u8 *ivptr;
	2479	+
	2480	+ ivptr = (u8 *)params->seq;
	2481	+ key->rxiv.hi = (ivptr[5] << 24) \| (ivptr[4] << 16) \|
	2482	+ (ivptr[3] << 8) \| ivptr[2];
	2483	+ key->rxiv.lo = (ivptr[1] << 8) \| ivptr[0];
	2484	+ key->iv_initialized = true;
	2485	+ }
2269	2486
2270	2487	switch (params->cipher) {
2271	2488	case WLAN_CIPHER_SUITE_WEP40:
..	..	@@ -2300,7 +2517,7 @@
2300	2517	brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_CCMP\n");
2301	2518	break;
2302	2519	default:
2303		- brcmf_err("Invalid cipher (0x%x)\n", params->cipher);
	2520	+ bphy_err(drvr, "Invalid cipher (0x%x)\n", params->cipher);
2304	2521	err = -EINVAL;
2305	2522	goto done;
2306	2523	}
..	..	@@ -2311,13 +2528,13 @@
2311	2528
2312	2529	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2313	2530	if (err) {
2314		- brcmf_err("get wsec error (%d)\n", err);
	2531	+ bphy_err(drvr, "get wsec error (%d)\n", err);
2315	2532	goto done;
2316	2533	}
2317	2534	wsec \|= val;
2318	2535	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
2319	2536	if (err) {
2320		- brcmf_err("set wsec error (%d)\n", err);
	2537	+ bphy_err(drvr, "set wsec error (%d)\n", err);
2321	2538	goto done;
2322	2539	}
2323	2540
..	..	@@ -2332,9 +2549,11 @@
2332	2549	void (callback)(void cookie,
2333	2550	struct key_params *params))
2334	2551	{
	2552	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2335	2553	struct key_params params;
2336	2554	struct brcmf_if *ifp = netdev_priv(ndev);
2337	2555	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	2556	+ struct brcmf_pub *drvr = cfg->pub;
2338	2557	struct brcmf_cfg80211_security *sec;
2339	2558	s32 wsec;
2340	2559	s32 err = 0;
..	..	@@ -2348,7 +2567,7 @@
2348	2567
2349	2568	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2350	2569	if (err) {
2351		- brcmf_err("WLC_GET_WSEC error (%d)\n", err);
	2570	+ bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
2352	2571	/* Ignore this error, may happen during DISASSOC */
2353	2572	err = -EAGAIN;
2354	2573	goto done;
..	..	@@ -2369,7 +2588,7 @@
2369	2588	params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
2370	2589	brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
2371	2590	} else {
2372		- brcmf_err("Invalid algo (0x%x)\n", wsec);
	2591	+ bphy_err(drvr, "Invalid algo (0x%x)\n", wsec);
2373	2592	err = -EINVAL;
2374	2593	goto done;
2375	2594	}
..	..	@@ -2399,6 +2618,7 @@
2399	2618	static void
2400	2619	brcmf_cfg80211_reconfigure_wep(struct brcmf_if *ifp)
2401	2620	{
	2621	+ struct brcmf_pub *drvr = ifp->drvr;
2402	2622	s32 err;
2403	2623	u8 key_idx;
2404	2624	struct brcmf_wsec_key *key;
..	..	@@ -2415,18 +2635,18 @@
2415	2635
2416	2636	err = send_key_to_dongle(ifp, key);
2417	2637	if (err) {
2418		- brcmf_err("Setting WEP key failed (%d)\n", err);
	2638	+ bphy_err(drvr, "Setting WEP key failed (%d)\n", err);
2419	2639	return;
2420	2640	}
2421	2641	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2422	2642	if (err) {
2423		- brcmf_err("get wsec error (%d)\n", err);
	2643	+ bphy_err(drvr, "get wsec error (%d)\n", err);
2424	2644	return;
2425	2645	}
2426	2646	wsec \|= WEP_ENABLED;
2427	2647	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
2428	2648	if (err)
2429		- brcmf_err("set wsec error (%d)\n", err);
	2649	+ bphy_err(drvr, "set wsec error (%d)\n", err);
2430	2650	}
2431	2651
2432	2652	static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si)
..	..	@@ -2452,6 +2672,7 @@
2452	2672
2453	2673	static void brcmf_fill_bss_param(struct brcmf_if ifp, struct station_info si)
2454	2674	{
	2675	+ struct brcmf_pub *drvr = ifp->drvr;
2455	2676	struct {
2456	2677	__le32 len;
2457	2678	struct brcmf_bss_info_le bss_le;
..	..	@@ -2467,7 +2688,7 @@
2467	2688	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO, buf,
2468	2689	WL_BSS_INFO_MAX);
2469	2690	if (err) {
2470		- brcmf_err("Failed to get bss info (%d)\n", err);
	2691	+ bphy_err(drvr, "Failed to get bss info (%d)\n", err);
2471	2692	goto out_kfree;
2472	2693	}
2473	2694	si->filled \|= BIT_ULL(NL80211_STA_INFO_BSS_PARAM);
..	..	@@ -2489,6 +2710,7 @@
2489	2710	brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
2490	2711	struct station_info *sinfo)
2491	2712	{
	2713	+ struct brcmf_pub *drvr = ifp->drvr;
2492	2714	struct brcmf_scb_val_le scbval;
2493	2715	struct brcmf_pktcnt_le pktcnt;
2494	2716	s32 err;
..	..	@@ -2498,7 +2720,7 @@
2498	2720	/* Get the current tx rate */
2499	2721	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_RATE, &rate);
2500	2722	if (err < 0) {
2501		- brcmf_err("BRCMF_C_GET_RATE error (%d)\n", err);
	2723	+ bphy_err(drvr, "BRCMF_C_GET_RATE error (%d)\n", err);
2502	2724	return err;
2503	2725	}
2504	2726	sinfo->filled \|= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
..	..	@@ -2508,7 +2730,7 @@
2508	2730	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI, &scbval,
2509	2731	sizeof(scbval));
2510	2732	if (err) {
2511		- brcmf_err("BRCMF_C_GET_RSSI error (%d)\n", err);
	2733	+ bphy_err(drvr, "BRCMF_C_GET_RSSI error (%d)\n", err);
2512	2734	return err;
2513	2735	}
2514	2736	rssi = le32_to_cpu(scbval.val);
..	..	@@ -2518,7 +2740,7 @@
2518	2740	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt,
2519	2741	sizeof(pktcnt));
2520	2742	if (err) {
2521		- brcmf_err("BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
	2743	+ bphy_err(drvr, "BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
2522	2744	return err;
2523	2745	}
2524	2746	sinfo->filled \|= BIT_ULL(NL80211_STA_INFO_RX_PACKETS) \|
..	..	@@ -2537,7 +2759,9 @@
2537	2759	brcmf_cfg80211_get_station(struct wiphy wiphy, struct net_device ndev,
2538	2760	const u8 mac, struct station_info sinfo)
2539	2761	{
	2762	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2540	2763	struct brcmf_if *ifp = netdev_priv(ndev);
	2764	+ struct brcmf_pub *drvr = cfg->pub;
2541	2765	struct brcmf_scb_val_le scb_val;
2542	2766	s32 err = 0;
2543	2767	struct brcmf_sta_info_le sta_info_le;
..	..	@@ -2567,7 +2791,7 @@
2567	2791	&sta_info_le,
2568	2792	sizeof(sta_info_le));
2569	2793	if (err < 0) {
2570		- brcmf_err("GET STA INFO failed, %d\n", err);
	2794	+ bphy_err(drvr, "GET STA INFO failed, %d\n", err);
2571	2795	goto done;
2572	2796	}
2573	2797	}
..	..	@@ -2638,7 +2862,8 @@
2638	2862	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI,
2639	2863	&scb_val, sizeof(scb_val));
2640	2864	if (err) {
2641		- brcmf_err("Could not get rssi (%d)\n", err);
	2865	+ bphy_err(drvr, "Could not get rssi (%d)\n",
	2866	+ err);
2642	2867	goto done;
2643	2868	} else {
2644	2869	rssi = le32_to_cpu(scb_val.val);
..	..	@@ -2659,6 +2884,7 @@
2659	2884	{
2660	2885	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2661	2886	struct brcmf_if *ifp = netdev_priv(ndev);
	2887	+ struct brcmf_pub *drvr = cfg->pub;
2662	2888	s32 err;
2663	2889
2664	2890	brcmf_dbg(TRACE, "Enter, idx %d\n", idx);
..	..	@@ -2669,8 +2895,8 @@
2669	2895	&cfg->assoclist,
2670	2896	sizeof(cfg->assoclist));
2671	2897	if (err) {
2672		- brcmf_err("BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
2673		- err);
	2898	+ bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
	2899	+ err);
2674	2900	cfg->assoclist.count = 0;
2675	2901	return -EOPNOTSUPP;
2676	2902	}
..	..	@@ -2690,6 +2916,7 @@
2690	2916	s32 err = 0;
2691	2917	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2692	2918	struct brcmf_if *ifp = netdev_priv(ndev);
	2919	+ struct brcmf_pub *drvr = cfg->pub;
2693	2920
2694	2921	brcmf_dbg(TRACE, "Enter\n");
2695	2922
..	..	@@ -2718,10 +2945,16 @@
2718	2945	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
2719	2946	if (err) {
2720	2947	if (err == -ENODEV)
2721		- brcmf_err("net_device is not ready yet\n");
	2948	+ bphy_err(drvr, "net_device is not ready yet\n");
2722	2949	else
2723		- brcmf_err("error (%d)\n", err);
	2950	+ bphy_err(drvr, "error (%d)\n", err);
2724	2951	}
	2952	+
	2953	+ err = brcmf_fil_iovar_int_set(ifp, "pm2_sleep_ret",
	2954	+ min_t(u32, timeout, BRCMF_PS_MAX_TIMEOUT_MS));
	2955	+ if (err)
	2956	+ bphy_err(drvr, "Unable to set pm timeout, (%d)\n", err);
	2957	+
2725	2958	done:
2726	2959	brcmf_dbg(TRACE, "Exit\n");
2727	2960	return err;
..	..	@@ -2731,6 +2964,7 @@
2731	2964	struct brcmf_bss_info_le *bi)
2732	2965	{
2733	2966	struct wiphy *wiphy = cfg_to_wiphy(cfg);
	2967	+ struct brcmf_pub *drvr = cfg->pub;
2734	2968	struct cfg80211_bss *bss;
2735	2969	enum nl80211_band band;
2736	2970	struct brcmu_chan ch;
..	..	@@ -2743,8 +2977,8 @@
2743	2977	struct cfg80211_inform_bss bss_data = {};
2744	2978
2745	2979	if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {
2746		- brcmf_err("Bss info is larger than buffer. Discarding\n");
2747		- return 0;
	2980	+ bphy_err(drvr, "Bss info is larger than buffer. Discarding\n");
	2981	+ return -EINVAL;
2748	2982	}
2749	2983
2750	2984	if (!bi->ctl_ch) {
..	..	@@ -2802,6 +3036,7 @@
2802	3036
2803	3037	static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
2804	3038	{
	3039	+ struct brcmf_pub *drvr = cfg->pub;
2805	3040	struct brcmf_scan_results *bss_list;
2806	3041	struct brcmf_bss_info_le bi = NULL; / must be initialized */
2807	3042	s32 err = 0;
..	..	@@ -2810,8 +3045,8 @@
2810	3045	bss_list = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
2811	3046	if (bss_list->count != 0 &&
2812	3047	bss_list->version != BRCMF_BSS_INFO_VERSION) {
2813		- brcmf_err("Version %d != WL_BSS_INFO_VERSION\n",
2814		- bss_list->version);
	3048	+ bphy_err(drvr, "Version %d != WL_BSS_INFO_VERSION\n",
	3049	+ bss_list->version);
2815	3050	return -EOPNOTSUPP;
2816	3051	}
2817	3052	brcmf_dbg(SCAN, "scanned AP count (%d)\n", bss_list->count);
..	..	@@ -2828,6 +3063,7 @@
2828	3063	struct net_device ndev, const u8 bssid)
2829	3064	{
2830	3065	struct wiphy *wiphy = cfg_to_wiphy(cfg);
	3066	+ struct brcmf_pub *drvr = cfg->pub;
2831	3067	struct ieee80211_channel *notify_channel;
2832	3068	struct brcmf_bss_info_le *bi = NULL;
2833	3069	struct ieee80211_supported_band *band;
..	..	@@ -2855,7 +3091,7 @@
2855	3091	err = brcmf_fil_cmd_data_get(netdev_priv(ndev), BRCMF_C_GET_BSS_INFO,
2856	3092	buf, WL_BSS_INFO_MAX);
2857	3093	if (err) {
2858		- brcmf_err("WLC_GET_BSS_INFO failed: %d\n", err);
	3094	+ bphy_err(drvr, "WLC_GET_BSS_INFO failed: %d\n", err);
2859	3095	goto CleanUp;
2860	3096	}
2861	3097
..	..	@@ -2909,10 +3145,9 @@
2909	3145	static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
2910	3146	struct brcmf_if *ifp)
2911	3147	{
	3148	+ struct brcmf_pub *drvr = cfg->pub;
2912	3149	struct brcmf_bss_info_le *bi;
2913	3150	const struct brcmf_tlv *tim;
2914		- u16 beacon_interval;
2915		- u8 dtim_period;
2916	3151	size_t ie_len;
2917	3152	u8 *ie;
2918	3153	s32 err = 0;
..	..	@@ -2925,7 +3160,7 @@
2925	3160	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO,
2926	3161	cfg->extra_buf, WL_EXTRA_BUF_MAX);
2927	3162	if (err) {
2928		- brcmf_err("Could not get bss info %d\n", err);
	3163	+ bphy_err(drvr, "Could not get bss info %d\n", err);
2929	3164	goto update_bss_info_out;
2930	3165	}
2931	3166
..	..	@@ -2936,12 +3171,9 @@
2936	3171
2937	3172	ie = ((u8 *)bi) + le16_to_cpu(bi->ie_offset);
2938	3173	ie_len = le32_to_cpu(bi->ie_length);
2939		- beacon_interval = le16_to_cpu(bi->beacon_period);
2940	3174
2941	3175	tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
2942		- if (tim)
2943		- dtim_period = tim->data[1];
2944		- else {
	3176	+ if (!tim) {
2945	3177	/*
2946	3178	* active scan was done so we could not get dtim
2947	3179	* information out of probe response.
..	..	@@ -2950,10 +3182,9 @@
2950	3182	u32 var;
2951	3183	err = brcmf_fil_iovar_int_get(ifp, "dtim_assoc", &var);
2952	3184	if (err) {
2953		- brcmf_err("wl dtim_assoc failed (%d)\n", err);
	3185	+ bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
2954	3186	goto update_bss_info_out;
2955	3187	}
2956		- dtim_period = (u8)var;
2957	3188	}
2958	3189
2959	3190	update_bss_info_out:
..	..	@@ -2988,9 +3219,10 @@
2988	3219	{
2989	3220	struct brcmf_cfg80211_info *cfg =
2990	3221	from_timer(cfg, t, escan_timeout);
	3222	+ struct brcmf_pub *drvr = cfg->pub;
2991	3223
2992	3224	if (cfg->int_escan_map \|\| cfg->scan_request) {
2993		- brcmf_err("timer expired\n");
	3225	+ bphy_err(drvr, "timer expired\n");
2994	3226	schedule_work(&cfg->escan_timeout_work);
2995	3227	}
2996	3228	}
..	..	@@ -3038,7 +3270,8 @@
3038	3270	brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
3039	3271	const struct brcmf_event_msg e, void data)
3040	3272	{
3041		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3273	+ struct brcmf_pub *drvr = ifp->drvr;
	3274	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3042	3275	s32 status;
3043	3276	struct brcmf_escan_result_le *escan_result_le;
3044	3277	u32 escan_buflen;
..	..	@@ -3055,32 +3288,33 @@
3055	3288	goto exit;
3056	3289
3057	3290	if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
3058		- brcmf_err("scan not ready, bsscfgidx=%d\n", ifp->bsscfgidx);
	3291	+ bphy_err(drvr, "scan not ready, bsscfgidx=%d\n",
	3292	+ ifp->bsscfgidx);
3059	3293	return -EPERM;
3060	3294	}
3061	3295
3062	3296	if (status == BRCMF_E_STATUS_PARTIAL) {
3063	3297	brcmf_dbg(SCAN, "ESCAN Partial result\n");
3064	3298	if (e->datalen < sizeof(*escan_result_le)) {
3065		- brcmf_err("invalid event data length\n");
	3299	+ bphy_err(drvr, "invalid event data length\n");
3066	3300	goto exit;
3067	3301	}
3068	3302	escan_result_le = (struct brcmf_escan_result_le *) data;
3069	3303	if (!escan_result_le) {
3070		- brcmf_err("Invalid escan result (NULL pointer)\n");
	3304	+ bphy_err(drvr, "Invalid escan result (NULL pointer)\n");
3071	3305	goto exit;
3072	3306	}
3073	3307	escan_buflen = le32_to_cpu(escan_result_le->buflen);
3074	3308	if (escan_buflen > BRCMF_ESCAN_BUF_SIZE \|\|
3075	3309	escan_buflen > e->datalen \|\|
3076	3310	escan_buflen < sizeof(*escan_result_le)) {
3077		- brcmf_err("Invalid escan buffer length: %d\n",
3078		- escan_buflen);
	3311	+ bphy_err(drvr, "Invalid escan buffer length: %d\n",
	3312	+ escan_buflen);
3079	3313	goto exit;
3080	3314	}
3081	3315	if (le16_to_cpu(escan_result_le->bss_count) != 1) {
3082		- brcmf_err("Invalid bss_count %d: ignoring\n",
3083		- escan_result_le->bss_count);
	3316	+ bphy_err(drvr, "Invalid bss_count %d: ignoring\n",
	3317	+ escan_result_le->bss_count);
3084	3318	goto exit;
3085	3319	}
3086	3320	bss_info_le = &escan_result_le->bss_info_le;
..	..	@@ -3095,8 +3329,8 @@
3095	3329
3096	3330	bi_length = le32_to_cpu(bss_info_le->length);
3097	3331	if (bi_length != escan_buflen - WL_ESCAN_RESULTS_FIXED_SIZE) {
3098		- brcmf_err("Ignoring invalid bss_info length: %d\n",
3099		- bi_length);
	3332	+ bphy_err(drvr, "Ignoring invalid bss_info length: %d\n",
	3333	+ bi_length);
3100	3334	goto exit;
3101	3335	}
3102	3336
..	..	@@ -3104,7 +3338,7 @@
3104	3338	BIT(NL80211_IFTYPE_ADHOC))) {
3105	3339	if (le16_to_cpu(bss_info_le->capability) &
3106	3340	WLAN_CAPABILITY_IBSS) {
3107		- brcmf_err("Ignoring IBSS result\n");
	3341	+ bphy_err(drvr, "Ignoring IBSS result\n");
3108	3342	goto exit;
3109	3343	}
3110	3344	}
..	..	@@ -3112,7 +3346,7 @@
3112	3346	list = (struct brcmf_scan_results *)
3113	3347	cfg->escan_info.escan_buf;
3114	3348	if (bi_length > BRCMF_ESCAN_BUF_SIZE - list->buflen) {
3115		- brcmf_err("Buffer is too small: ignoring\n");
	3349	+ bphy_err(drvr, "Buffer is too small: ignoring\n");
3116	3350	goto exit;
3117	3351	}
3118	3352
..	..	@@ -3248,7 +3482,7 @@
3248	3482	switch (pfn_v1->version) {
3249	3483	default:
3250	3484	WARN_ON(1);
3251		- /* fall-thru */
	3485	+ fallthrough;
3252	3486	case cpu_to_le32(1):
3253	3487	netinfo = (struct brcmf_pno_net_info_le *)(pfn_v1 + 1);
3254	3488	break;
..	..	@@ -3271,7 +3505,8 @@
3271	3505	brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
3272	3506	const struct brcmf_event_msg e, void data)
3273	3507	{
3274		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3508	+ struct brcmf_pub *drvr = ifp->drvr;
	3509	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3275	3510	struct brcmf_pno_net_info_le netinfo, netinfo_start;
3276	3511	struct cfg80211_scan_request *request = NULL;
3277	3512	struct wiphy *wiphy = cfg_to_wiphy(cfg);
..	..	@@ -3304,14 +3539,14 @@
3304	3539	WARN_ON(status != BRCMF_PNO_SCAN_COMPLETE);
3305	3540	brcmf_dbg(SCAN, "PFN NET FOUND event. count: %d\n", result_count);
3306	3541	if (!result_count) {
3307		- brcmf_err("FALSE PNO Event. (pfn_count == 0)\n");
	3542	+ bphy_err(drvr, "FALSE PNO Event. (pfn_count == 0)\n");
3308	3543	goto out_err;
3309	3544	}
3310	3545
3311	3546	netinfo_start = brcmf_get_netinfo_array(pfn_result);
3312	3547	datalen = e->datalen - ((void )netinfo_start - (void )pfn_result);
3313	3548	if (datalen < result_count * sizeof(*netinfo)) {
3314		- brcmf_err("insufficient event data\n");
	3549	+ bphy_err(drvr, "insufficient event data\n");
3315	3550	goto out_err;
3316	3551	}
3317	3552
..	..	@@ -3358,15 +3593,16 @@
3358	3593	struct net_device *ndev,
3359	3594	struct cfg80211_sched_scan_request *req)
3360	3595	{
3361		- struct brcmf_if *ifp = netdev_priv(ndev);
3362	3596	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	3597	+ struct brcmf_if *ifp = netdev_priv(ndev);
	3598	+ struct brcmf_pub *drvr = cfg->pub;
3363	3599
3364	3600	brcmf_dbg(SCAN, "Enter: n_match_sets=%d n_ssids=%d\n",
3365	3601	req->n_match_sets, req->n_ssids);
3366	3602
3367	3603	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
3368		- brcmf_err("Scanning suppressed: status=%lu\n",
3369		- cfg->scan_status);
	3604	+ bphy_err(drvr, "Scanning suppressed: status=%lu\n",
	3605	+ cfg->scan_status);
3370	3606	return -EAGAIN;
3371	3607	}
3372	3608
..	..	@@ -3444,7 +3680,8 @@
3444	3680	brcmf_wowl_nd_results(struct brcmf_if ifp, const struct brcmf_event_msg e,
3445	3681	void *data)
3446	3682	{
3447		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3683	+ struct brcmf_pub *drvr = ifp->drvr;
	3684	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3448	3685	struct brcmf_pno_scanresults_le *pfn_result;
3449	3686	struct brcmf_pno_net_info_le *netinfo;
3450	3687
..	..	@@ -3463,8 +3700,8 @@
3463	3700	}
3464	3701
3465	3702	if (le32_to_cpu(pfn_result->count) < 1) {
3466		- brcmf_err("Invalid result count, expected 1 (%d)\n",
3467		- le32_to_cpu(pfn_result->count));
	3703	+ bphy_err(drvr, "Invalid result count, expected 1 (%d)\n",
	3704	+ le32_to_cpu(pfn_result->count));
3468	3705	return -EINVAL;
3469	3706	}
3470	3707
..	..	@@ -3493,6 +3730,7 @@
3493	3730	static void brcmf_report_wowl_wakeind(struct wiphy wiphy, struct brcmf_if ifp)
3494	3731	{
3495	3732	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	3733	+ struct brcmf_pub *drvr = cfg->pub;
3496	3734	struct brcmf_wowl_wakeind_le wake_ind_le;
3497	3735	struct cfg80211_wowlan_wakeup wakeup_data;
3498	3736	struct cfg80211_wowlan_wakeup *wakeup;
..	..	@@ -3503,7 +3741,7 @@
3503	3741	err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &wake_ind_le,
3504	3742	sizeof(wake_ind_le));
3505	3743	if (err) {
3506		- brcmf_err("Get wowl_wakeind failed, err = %d\n", err);
	3744	+ bphy_err(drvr, "Get wowl_wakeind failed, err = %d\n", err);
3507	3745	return;
3508	3746	}
3509	3747
..	..	@@ -3544,7 +3782,7 @@
3544	3782	cfg->wowl.nd_data_completed,
3545	3783	BRCMF_ND_INFO_TIMEOUT);
3546	3784	if (!timeout)
3547		- brcmf_err("No result for wowl net detect\n");
	3785	+ bphy_err(drvr, "No result for wowl net detect\n");
3548	3786	else
3549	3787	wakeup_data.net_detect = cfg->wowl.nd_info;
3550	3788	}
..	..	@@ -3683,7 +3921,7 @@
3683	3921	* disassociate from AP to save power while system is
3684	3922	* in suspended state
3685	3923	*/
3686		- brcmf_link_down(vif, WLAN_REASON_UNSPECIFIED);
	3924	+ brcmf_link_down(vif, WLAN_REASON_UNSPECIFIED, true);
3687	3925	/* Make sure WPA_Supplicant receives all the event
3688	3926	* generated due to DISASSOC call to the fw to keep
3689	3927	* the state fw and WPA_Supplicant state consistent
..	..	@@ -3733,6 +3971,7 @@
3733	3971	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
3734	3972	struct brcmf_if *ifp = netdev_priv(ndev);
3735	3973	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
	3974	+ struct brcmf_pub *drvr = cfg->pub;
3736	3975	s32 err;
3737	3976	u32 npmk, i;
3738	3977
..	..	@@ -3752,15 +3991,12 @@
3752	3991	cfg->pmk_list.npmk = cpu_to_le32(npmk);
3753	3992	}
3754	3993	} else {
3755		- brcmf_err("Too many PMKSA entries cached %d\n", npmk);
	3994	+ bphy_err(drvr, "Too many PMKSA entries cached %d\n", npmk);
3756	3995	return -EINVAL;
3757	3996	}
3758	3997
3759	3998	brcmf_dbg(CONN, "set_pmksa - PMK bssid: %pM =\n", pmk[npmk].bssid);
3760		- for (i = 0; i < WLAN_PMKID_LEN; i += 4)
3761		- brcmf_dbg(CONN, "%02x %02x %02x %02x\n", pmk[npmk].pmkid[i],
3762		- pmk[npmk].pmkid[i + 1], pmk[npmk].pmkid[i + 2],
3763		- pmk[npmk].pmkid[i + 3]);
	3999	+ brcmf_dbg(CONN, "%*ph\n", WLAN_PMKID_LEN, pmk[npmk].pmkid);
3764	4000
3765	4001	err = brcmf_update_pmklist(cfg, ifp);
3766	4002
..	..	@@ -3775,6 +4011,7 @@
3775	4011	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
3776	4012	struct brcmf_if *ifp = netdev_priv(ndev);
3777	4013	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
	4014	+ struct brcmf_pub *drvr = cfg->pub;
3778	4015	s32 err;
3779	4016	u32 npmk, i;
3780	4017
..	..	@@ -3798,7 +4035,7 @@
3798	4035	memset(&pmk[i], 0, sizeof(*pmk));
3799	4036	cfg->pmk_list.npmk = cpu_to_le32(npmk - 1);
3800	4037	} else {
3801		- brcmf_err("Cache entry not found\n");
	4038	+ bphy_err(drvr, "Cache entry not found\n");
3802	4039	return -EINVAL;
3803	4040	}
3804	4041
..	..	@@ -3830,19 +4067,20 @@
3830	4067
3831	4068	static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp)
3832	4069	{
	4070	+ struct brcmf_pub *drvr = ifp->drvr;
3833	4071	s32 err;
3834	4072	s32 wpa_val;
3835	4073
3836	4074	/* set auth */
3837	4075	err = brcmf_fil_bsscfg_int_set(ifp, "auth", 0);
3838	4076	if (err < 0) {
3839		- brcmf_err("auth error %d\n", err);
	4077	+ bphy_err(drvr, "auth error %d\n", err);
3840	4078	return err;
3841	4079	}
3842	4080	/* set wsec */
3843	4081	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", 0);
3844	4082	if (err < 0) {
3845		- brcmf_err("wsec error %d\n", err);
	4083	+ bphy_err(drvr, "wsec error %d\n", err);
3846	4084	return err;
3847	4085	}
3848	4086	/* set upper-layer auth */
..	..	@@ -3852,7 +4090,7 @@
3852	4090	wpa_val = WPA_AUTH_DISABLED;
3853	4091	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_val);
3854	4092	if (err < 0) {
3855		- brcmf_err("wpa_auth error %d\n", err);
	4093	+ bphy_err(drvr, "wpa_auth error %d\n", err);
3856	4094	return err;
3857	4095	}
3858	4096
..	..	@@ -3872,6 +4110,7 @@
3872	4110	const struct brcmf_vs_tlv *wpa_ie,
3873	4111	bool is_rsn_ie)
3874	4112	{
	4113	+ struct brcmf_pub *drvr = ifp->drvr;
3875	4114	u32 auth = 0; /* d11 open authentication */
3876	4115	u16 count;
3877	4116	s32 err = 0;
..	..	@@ -3902,13 +4141,13 @@
3902	4141	/* check for multicast cipher suite */
3903	4142	if (offset + WPA_IE_MIN_OUI_LEN > len) {
3904	4143	err = -EINVAL;
3905		- brcmf_err("no multicast cipher suite\n");
	4144	+ bphy_err(drvr, "no multicast cipher suite\n");
3906	4145	goto exit;
3907	4146	}
3908	4147
3909	4148	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3910	4149	err = -EINVAL;
3911		- brcmf_err("ivalid OUI\n");
	4150	+ bphy_err(drvr, "ivalid OUI\n");
3912	4151	goto exit;
3913	4152	}
3914	4153	offset += TLV_OUI_LEN;
..	..	@@ -3930,7 +4169,7 @@
3930	4169	break;
3931	4170	default:
3932	4171	err = -EINVAL;
3933		- brcmf_err("Invalid multi cast cipher info\n");
	4172	+ bphy_err(drvr, "Invalid multi cast cipher info\n");
3934	4173	goto exit;
3935	4174	}
3936	4175
..	..	@@ -3941,13 +4180,13 @@
3941	4180	/* Check for unicast suite(s) */
3942	4181	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
3943	4182	err = -EINVAL;
3944		- brcmf_err("no unicast cipher suite\n");
	4183	+ bphy_err(drvr, "no unicast cipher suite\n");
3945	4184	goto exit;
3946	4185	}
3947	4186	for (i = 0; i < count; i++) {
3948	4187	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3949	4188	err = -EINVAL;
3950		- brcmf_err("ivalid OUI\n");
	4189	+ bphy_err(drvr, "ivalid OUI\n");
3951	4190	goto exit;
3952	4191	}
3953	4192	offset += TLV_OUI_LEN;
..	..	@@ -3965,7 +4204,7 @@
3965	4204	pval \|= AES_ENABLED;
3966	4205	break;
3967	4206	default:
3968		- brcmf_err("Invalid unicast security info\n");
	4207	+ bphy_err(drvr, "Invalid unicast security info\n");
3969	4208	}
3970	4209	offset++;
3971	4210	}
..	..	@@ -3975,13 +4214,13 @@
3975	4214	/* Check for auth key management suite(s) */
3976	4215	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
3977	4216	err = -EINVAL;
3978		- brcmf_err("no auth key mgmt suite\n");
	4217	+ bphy_err(drvr, "no auth key mgmt suite\n");
3979	4218	goto exit;
3980	4219	}
3981	4220	for (i = 0; i < count; i++) {
3982	4221	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3983	4222	err = -EINVAL;
3984		- brcmf_err("ivalid OUI\n");
	4223	+ bphy_err(drvr, "ivalid OUI\n");
3985	4224	goto exit;
3986	4225	}
3987	4226	offset += TLV_OUI_LEN;
..	..	@@ -4008,8 +4247,12 @@
4008	4247	brcmf_dbg(TRACE, "RSN_AKM_MFP_1X\n");
4009	4248	wpa_auth \|= WPA2_AUTH_1X_SHA256;
4010	4249	break;
	4250	+ case RSN_AKM_SAE:
	4251	+ brcmf_dbg(TRACE, "RSN_AKM_SAE\n");
	4252	+ wpa_auth \|= WPA3_AUTH_SAE_PSK;
	4253	+ break;
4011	4254	default:
4012		- brcmf_err("Invalid key mgmt info\n");
	4255	+ bphy_err(drvr, "Invalid key mgmt info\n");
4013	4256	}
4014	4257	offset++;
4015	4258	}
..	..	@@ -4025,11 +4268,12 @@
4025	4268	brcmf_dbg(TRACE, "MFP Required\n");
4026	4269	mfp = BRCMF_MFP_REQUIRED;
4027	4270	/* Firmware only supports mfp required in
4028		- * combination with WPA2_AUTH_PSK_SHA256 or
4029		- * WPA2_AUTH_1X_SHA256.
	4271	+ * combination with WPA2_AUTH_PSK_SHA256,
	4272	+ * WPA2_AUTH_1X_SHA256, or WPA3_AUTH_SAE_PSK.
4030	4273	*/
4031	4274	if (!(wpa_auth & (WPA2_AUTH_PSK_SHA256 \|
4032		- WPA2_AUTH_1X_SHA256))) {
	4275	+ WPA2_AUTH_1X_SHA256 \|
	4276	+ WPA3_AUTH_SAE_PSK))) {
4033	4277	err = -EINVAL;
4034	4278	goto exit;
4035	4279	}
..	..	@@ -4051,7 +4295,7 @@
4051	4295	err = brcmf_fil_bsscfg_int_set(ifp, "wme_bss_disable",
4052	4296	wme_bss_disable);
4053	4297	if (err < 0) {
4054		- brcmf_err("wme_bss_disable error %d\n", err);
	4298	+ bphy_err(drvr, "wme_bss_disable error %d\n", err);
4055	4299	goto exit;
4056	4300	}
4057	4301
..	..	@@ -4065,7 +4309,7 @@
4065	4309	&data[offset],
4066	4310	WPA_IE_MIN_OUI_LEN);
4067	4311	if (err < 0) {
4068		- brcmf_err("bip error %d\n", err);
	4312	+ bphy_err(drvr, "bip error %d\n", err);
4069	4313	goto exit;
4070	4314	}
4071	4315	}
..	..	@@ -4076,13 +4320,13 @@
4076	4320	/* set auth */
4077	4321	err = brcmf_fil_bsscfg_int_set(ifp, "auth", auth);
4078	4322	if (err < 0) {
4079		- brcmf_err("auth error %d\n", err);
	4323	+ bphy_err(drvr, "auth error %d\n", err);
4080	4324	goto exit;
4081	4325	}
4082	4326	/* set wsec */
4083	4327	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
4084	4328	if (err < 0) {
4085		- brcmf_err("wsec error %d\n", err);
	4329	+ bphy_err(drvr, "wsec error %d\n", err);
4086	4330	goto exit;
4087	4331	}
4088	4332	/* Configure MFP, this needs to go after wsec otherwise the wsec command
..	..	@@ -4091,14 +4335,14 @@
4091	4335	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP)) {
4092	4336	err = brcmf_fil_bsscfg_int_set(ifp, "mfp", mfp);
4093	4337	if (err < 0) {
4094		- brcmf_err("mfp error %d\n", err);
	4338	+ bphy_err(drvr, "mfp error %d\n", err);
4095	4339	goto exit;
4096	4340	}
4097	4341	}
4098	4342	/* set upper-layer auth */
4099	4343	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_auth);
4100	4344	if (err < 0) {
4101		- brcmf_err("wpa_auth error %d\n", err);
	4345	+ bphy_err(drvr, "wpa_auth error %d\n", err);
4102	4346	goto exit;
4103	4347	}
4104	4348
..	..	@@ -4146,10 +4390,8 @@
4146	4390
4147	4391	vndr_ies->count++;
4148	4392
4149		- brcmf_dbg(TRACE, "** OUI %02x %02x %02x, type 0x%02x\n",
4150		- parsed_info->vndrie.oui[0],
4151		- parsed_info->vndrie.oui[1],
4152		- parsed_info->vndrie.oui[2],
	4393	+ brcmf_dbg(TRACE, "** OUI %3ph, type 0x%02x\n",
	4394	+ parsed_info->vndrie.oui,
4153	4395	parsed_info->vndrie.oui_type);
4154	4396
4155	4397	if (vndr_ies->count >= VNDR_IE_PARSE_LIMIT)
..	..	@@ -4168,9 +4410,7 @@
4168	4410	static u32
4169	4411	brcmf_vndr_ie(u8 iebuf, s32 pktflag, u8 ie_ptr, u32 ie_len, s8 *add_del_cmd)
4170	4412	{
4171		-
4172		- strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1);
4173		- iebuf[VNDR_IE_CMD_LEN - 1] = '\0';
	4413	+ strscpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN);
4174	4414
4175	4415	put_unaligned_le32(1, &iebuf[VNDR_IE_COUNT_OFFSET]);
4176	4416
..	..	@@ -4184,6 +4424,7 @@
4184	4424	s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
4185	4425	const u8 *vndr_ie_buf, u32 vndr_ie_len)
4186	4426	{
	4427	+ struct brcmf_pub *drvr;
4187	4428	struct brcmf_if *ifp;
4188	4429	struct vif_saved_ie *saved_ie;
4189	4430	s32 err = 0;
..	..	@@ -4205,6 +4446,7 @@
4205	4446	if (!vif)
4206	4447	return -ENODEV;
4207	4448	ifp = vif->ifp;
	4449	+ drvr = ifp->drvr;
4208	4450	saved_ie = &vif->saved_ie;
4209	4451
4210	4452	brcmf_dbg(TRACE, "bsscfgidx %d, pktflag : 0x%02X\n", ifp->bsscfgidx,
..	..	@@ -4234,15 +4476,20 @@
4234	4476	mgmt_ie_len = &saved_ie->assoc_req_ie_len;
4235	4477	mgmt_ie_buf_len = sizeof(saved_ie->assoc_req_ie);
4236	4478	break;
	4479	+ case BRCMF_VNDR_IE_ASSOCRSP_FLAG:
	4480	+ mgmt_ie_buf = saved_ie->assoc_res_ie;
	4481	+ mgmt_ie_len = &saved_ie->assoc_res_ie_len;
	4482	+ mgmt_ie_buf_len = sizeof(saved_ie->assoc_res_ie);
	4483	+ break;
4237	4484	default:
4238	4485	err = -EPERM;
4239		- brcmf_err("not suitable type\n");
	4486	+ bphy_err(drvr, "not suitable type\n");
4240	4487	goto exit;
4241	4488	}
4242	4489
4243	4490	if (vndr_ie_len > mgmt_ie_buf_len) {
4244	4491	err = -ENOMEM;
4245		- brcmf_err("extra IE size too big\n");
	4492	+ bphy_err(drvr, "extra IE size too big\n");
4246	4493	goto exit;
4247	4494	}
4248	4495
..	..	@@ -4273,12 +4520,10 @@
4273	4520	for (i = 0; i < old_vndr_ies.count; i++) {
4274	4521	vndrie_info = &old_vndr_ies.ie_info[i];
4275	4522
4276		- brcmf_dbg(TRACE, "DEL ID : %d, Len: %d , OUI:%02x:%02x:%02x\n",
	4523	+ brcmf_dbg(TRACE, "DEL ID : %d, Len: %d , OUI:%3ph\n",
4277	4524	vndrie_info->vndrie.id,
4278	4525	vndrie_info->vndrie.len,
4279		- vndrie_info->vndrie.oui[0],
4280		- vndrie_info->vndrie.oui[1],
4281		- vndrie_info->vndrie.oui[2]);
	4526	+ vndrie_info->vndrie.oui);
4282	4527
4283	4528	del_add_ie_buf_len = brcmf_vndr_ie(curr_ie_buf, pktflag,
4284	4529	vndrie_info->ie_ptr,
..	..	@@ -4303,19 +4548,17 @@
4303	4548	/* verify remained buf size before copy data */
4304	4549	if (remained_buf_len < (vndrie_info->vndrie.len +
4305	4550	VNDR_IE_VSIE_OFFSET)) {
4306		- brcmf_err("no space in mgmt_ie_buf: len left %d",
4307		- remained_buf_len);
	4551	+ bphy_err(drvr, "no space in mgmt_ie_buf: len left %d",
	4552	+ remained_buf_len);
4308	4553	break;
4309	4554	}
4310	4555	remained_buf_len -= (vndrie_info->ie_len +
4311	4556	VNDR_IE_VSIE_OFFSET);
4312	4557
4313		- brcmf_dbg(TRACE, "ADDED ID : %d, Len: %d, OUI:%02x:%02x:%02x\n",
	4558	+ brcmf_dbg(TRACE, "ADDED ID : %d, Len: %d, OUI:%3ph\n",
4314	4559	vndrie_info->vndrie.id,
4315	4560	vndrie_info->vndrie.len,
4316		- vndrie_info->vndrie.oui[0],
4317		- vndrie_info->vndrie.oui[1],
4318		- vndrie_info->vndrie.oui[2]);
	4561	+ vndrie_info->vndrie.oui);
4319	4562
4320	4563	del_add_ie_buf_len = brcmf_vndr_ie(curr_ie_buf, pktflag,
4321	4564	vndrie_info->ie_ptr,
..	..	@@ -4335,7 +4578,7 @@
4335	4578	err = brcmf_fil_bsscfg_data_set(ifp, "vndr_ie", iovar_ie_buf,
4336	4579	total_ie_buf_len);
4337	4580	if (err)
4338		- brcmf_err("vndr ie set error : %d\n", err);
	4581	+ bphy_err(drvr, "vndr ie set error : %d\n", err);
4339	4582	}
4340	4583
4341	4584	exit:
..	..	@@ -4363,13 +4606,14 @@
4363	4606	brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif,
4364	4607	struct cfg80211_beacon_data *beacon)
4365	4608	{
	4609	+ struct brcmf_pub *drvr = vif->ifp->drvr;
4366	4610	s32 err;
4367	4611
4368	4612	/* Set Beacon IEs to FW */
4369	4613	err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_BEACON_FLAG,
4370	4614	beacon->tail, beacon->tail_len);
4371	4615	if (err) {
4372		- brcmf_err("Set Beacon IE Failed\n");
	4616	+ bphy_err(drvr, "Set Beacon IE Failed\n");
4373	4617	return err;
4374	4618	}
4375	4619	brcmf_dbg(TRACE, "Applied Vndr IEs for Beacon\n");
..	..	@@ -4379,9 +4623,60 @@
4379	4623	beacon->proberesp_ies,
4380	4624	beacon->proberesp_ies_len);
4381	4625	if (err)
4382		- brcmf_err("Set Probe Resp IE Failed\n");
	4626	+ bphy_err(drvr, "Set Probe Resp IE Failed\n");
4383	4627	else
4384	4628	brcmf_dbg(TRACE, "Applied Vndr IEs for Probe Resp\n");
	4629	+
	4630	+ /* Set Assoc Response IEs to FW */
	4631	+ err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_ASSOCRSP_FLAG,
	4632	+ beacon->assocresp_ies,
	4633	+ beacon->assocresp_ies_len);
	4634	+ if (err)
	4635	+ brcmf_err("Set Assoc Resp IE Failed\n");
	4636	+ else
	4637	+ brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc Resp\n");
	4638	+
	4639	+ return err;
	4640	+}
	4641	+
	4642	+static s32
	4643	+brcmf_parse_configure_security(struct brcmf_if *ifp,
	4644	+ struct cfg80211_ap_settings *settings,
	4645	+ enum nl80211_iftype dev_role)
	4646	+{
	4647	+ const struct brcmf_tlv *rsn_ie;
	4648	+ const struct brcmf_vs_tlv *wpa_ie;
	4649	+ s32 err = 0;
	4650	+
	4651	+ /* find the RSN_IE */
	4652	+ rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
	4653	+ settings->beacon.tail_len, WLAN_EID_RSN);
	4654	+
	4655	+ /* find the WPA_IE */
	4656	+ wpa_ie = brcmf_find_wpaie((u8 *)settings->beacon.tail,
	4657	+ settings->beacon.tail_len);
	4658	+
	4659	+ if (wpa_ie \|\| rsn_ie) {
	4660	+ brcmf_dbg(TRACE, "WPA(2) IE is found\n");
	4661	+ if (wpa_ie) {
	4662	+ /* WPA IE */
	4663	+ err = brcmf_configure_wpaie(ifp, wpa_ie, false);
	4664	+ if (err < 0)
	4665	+ return err;
	4666	+ } else {
	4667	+ struct brcmf_vs_tlv *tmp_ie;
	4668	+
	4669	+ tmp_ie = (struct brcmf_vs_tlv *)rsn_ie;
	4670	+
	4671	+ /* RSN IE */
	4672	+ err = brcmf_configure_wpaie(ifp, tmp_ie, true);
	4673	+ if (err < 0)
	4674	+ return err;
	4675	+ }
	4676	+ } else {
	4677	+ brcmf_dbg(TRACE, "No WPA(2) IEs found\n");
	4678	+ brcmf_configure_opensecurity(ifp);
	4679	+ }
4385	4680
4386	4681	return err;
4387	4682	}
..	..	@@ -4393,12 +4688,13 @@
4393	4688	s32 ie_offset;
4394	4689	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4395	4690	struct brcmf_if *ifp = netdev_priv(ndev);
	4691	+ struct brcmf_pub *drvr = cfg->pub;
	4692	+ struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	4693	+ struct cfg80211_crypto_settings *crypto = &settings->crypto;
4396	4694	const struct brcmf_tlv *ssid_ie;
4397	4695	const struct brcmf_tlv *country_ie;
4398	4696	struct brcmf_ssid_le ssid_le;
4399	4697	s32 err = -EPERM;
4400		- const struct brcmf_tlv *rsn_ie;
4401		- const struct brcmf_vs_tlv *wpa_ie;
4402	4698	struct brcmf_join_params join_params;
4403	4699	enum nl80211_iftype dev_role;
4404	4700	struct brcmf_fil_bss_enable_le bss_enable;
..	..	@@ -4452,43 +4748,14 @@
4452	4748	brcmf_configure_arp_nd_offload(ifp, false);
4453	4749	}
4454	4750
4455		- /* find the RSN_IE */
4456		- rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
4457		- settings->beacon.tail_len, WLAN_EID_RSN);
4458		-
4459		- /* find the WPA_IE */
4460		- wpa_ie = brcmf_find_wpaie((u8 *)settings->beacon.tail,
4461		- settings->beacon.tail_len);
4462		-
4463		- if ((wpa_ie != NULL \|\| rsn_ie != NULL)) {
4464		- brcmf_dbg(TRACE, "WPA(2) IE is found\n");
4465		- if (wpa_ie != NULL) {
4466		- /* WPA IE */
4467		- err = brcmf_configure_wpaie(ifp, wpa_ie, false);
4468		- if (err < 0)
4469		- goto exit;
4470		- } else {
4471		- struct brcmf_vs_tlv *tmp_ie;
4472		-
4473		- tmp_ie = (struct brcmf_vs_tlv *)rsn_ie;
4474		-
4475		- /* RSN IE */
4476		- err = brcmf_configure_wpaie(ifp, tmp_ie, true);
4477		- if (err < 0)
4478		- goto exit;
4479		- }
4480		- } else {
4481		- brcmf_dbg(TRACE, "No WPA(2) IEs found\n");
4482		- brcmf_configure_opensecurity(ifp);
4483		- }
4484		-
4485	4751	/* Parameters shared by all radio interfaces */
4486	4752	if (!mbss) {
4487	4753	if ((supports_11d) && (is_11d != ifp->vif->is_11d)) {
4488	4754	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
4489	4755	is_11d);
4490	4756	if (err < 0) {
4491		- brcmf_err("Regulatory Set Error, %d\n", err);
	4757	+ bphy_err(drvr, "Regulatory Set Error, %d\n",
	4758	+ err);
4492	4759	goto exit;
4493	4760	}
4494	4761	}
..	..	@@ -4496,8 +4763,8 @@
4496	4763	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD,
4497	4764	settings->beacon_interval);
4498	4765	if (err < 0) {
4499		- brcmf_err("Beacon Interval Set Error, %d\n",
4500		- err);
	4766	+ bphy_err(drvr, "Beacon Interval Set Error, %d\n",
	4767	+ err);
4501	4768	goto exit;
4502	4769	}
4503	4770	}
..	..	@@ -4505,17 +4772,20 @@
4505	4772	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_DTIMPRD,
4506	4773	settings->dtim_period);
4507	4774	if (err < 0) {
4508		- brcmf_err("DTIM Interval Set Error, %d\n", err);
	4775	+ bphy_err(drvr, "DTIM Interval Set Error, %d\n",
	4776	+ err);
4509	4777	goto exit;
4510	4778	}
4511	4779	}
4512	4780
4513	4781	if ((dev_role == NL80211_IFTYPE_AP) &&
4514	4782	((ifp->ifidx == 0) \|\|
4515		- !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) {
	4783	+ (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB) &&
	4784	+ !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)))) {
4516	4785	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
4517	4786	if (err < 0) {
4518		- brcmf_err("BRCMF_C_DOWN error %d\n", err);
	4787	+ bphy_err(drvr, "BRCMF_C_DOWN error %d\n",
	4788	+ err);
4519	4789	goto exit;
4520	4790	}
4521	4791	brcmf_fil_iovar_int_set(ifp, "apsta", 0);
..	..	@@ -4523,7 +4793,7 @@
4523	4793
4524	4794	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 1);
4525	4795	if (err < 0) {
4526		- brcmf_err("SET INFRA error %d\n", err);
	4796	+ bphy_err(drvr, "SET INFRA error %d\n", err);
4527	4797	goto exit;
4528	4798	}
4529	4799	} else if (WARN_ON(supports_11d && (is_11d != ifp->vif->is_11d))) {
..	..	@@ -4539,7 +4809,8 @@
4539	4809
4540	4810	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 1);
4541	4811	if (err < 0) {
4542		- brcmf_err("setting AP mode failed %d\n", err);
	4812	+ bphy_err(drvr, "setting AP mode failed %d\n",
	4813	+ err);
4543	4814	goto exit;
4544	4815	}
4545	4816	if (!mbss) {
..	..	@@ -4548,16 +4819,43 @@
4548	4819	*/
4549	4820	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
4550	4821	if (err < 0) {
4551		- brcmf_err("Set Channel failed: chspec=%d, %d\n",
4552		- chanspec, err);
	4822	+ bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
	4823	+ chanspec, err);
4553	4824	goto exit;
4554	4825	}
4555	4826	}
4556	4827	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
4557	4828	if (err < 0) {
4558		- brcmf_err("BRCMF_C_UP error (%d)\n", err);
	4829	+ bphy_err(drvr, "BRCMF_C_UP error (%d)\n", err);
4559	4830	goto exit;
4560	4831	}
	4832	+
	4833	+ if (crypto->psk) {
	4834	+ brcmf_dbg(INFO, "using PSK offload\n");
	4835	+ profile->use_fwauth \|= BIT(BRCMF_PROFILE_FWAUTH_PSK);
	4836	+ err = brcmf_set_pmk(ifp, crypto->psk,
	4837	+ BRCMF_WSEC_MAX_PSK_LEN);
	4838	+ if (err < 0)
	4839	+ goto exit;
	4840	+ }
	4841	+ if (crypto->sae_pwd) {
	4842	+ brcmf_dbg(INFO, "using SAE offload\n");
	4843	+ profile->use_fwauth \|= BIT(BRCMF_PROFILE_FWAUTH_SAE);
	4844	+ err = brcmf_set_sae_password(ifp, crypto->sae_pwd,
	4845	+ crypto->sae_pwd_len);
	4846	+ if (err < 0)
	4847	+ goto exit;
	4848	+ }
	4849	+ if (profile->use_fwauth == 0)
	4850	+ profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
	4851	+
	4852	+ err = brcmf_parse_configure_security(ifp, settings,
	4853	+ NL80211_IFTYPE_AP);
	4854	+ if (err < 0) {
	4855	+ bphy_err(drvr, "brcmf_parse_configure_security error\n");
	4856	+ goto exit;
	4857	+ }
	4858	+
4561	4859	/* On DOWN the firmware removes the WEP keys, reconfigure
4562	4860	* them if they were set.
4563	4861	*/
..	..	@@ -4570,30 +4868,40 @@
4570	4868	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
4571	4869	&join_params, sizeof(join_params));
4572	4870	if (err < 0) {
4573		- brcmf_err("SET SSID error (%d)\n", err);
	4871	+ bphy_err(drvr, "SET SSID error (%d)\n", err);
4574	4872	goto exit;
4575	4873	}
4576	4874
4577		- if (settings->hidden_ssid) {
4578		- err = brcmf_fil_iovar_int_set(ifp, "closednet", 1);
4579		- if (err) {
4580		- brcmf_err("closednet error (%d)\n", err);
4581		- goto exit;
4582		- }
	4875	+ err = brcmf_fil_iovar_int_set(ifp, "closednet",
	4876	+ settings->hidden_ssid);
	4877	+ if (err) {
	4878	+ bphy_err(drvr, "%s closednet error (%d)\n",
	4879	+ settings->hidden_ssid ?
	4880	+ "enabled" : "disabled",
	4881	+ err);
	4882	+ goto exit;
4583	4883	}
4584	4884
4585	4885	brcmf_dbg(TRACE, "AP mode configuration complete\n");
4586	4886	} else if (dev_role == NL80211_IFTYPE_P2P_GO) {
4587	4887	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
4588	4888	if (err < 0) {
4589		- brcmf_err("Set Channel failed: chspec=%d, %d\n",
4590		- chanspec, err);
	4889	+ bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
	4890	+ chanspec, err);
4591	4891	goto exit;
4592	4892	}
	4893	+
	4894	+ err = brcmf_parse_configure_security(ifp, settings,
	4895	+ NL80211_IFTYPE_P2P_GO);
	4896	+ if (err < 0) {
	4897	+ brcmf_err("brcmf_parse_configure_security error\n");
	4898	+ goto exit;
	4899	+ }
	4900	+
4593	4901	err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
4594	4902	sizeof(ssid_le));
4595	4903	if (err < 0) {
4596		- brcmf_err("setting ssid failed %d\n", err);
	4904	+ bphy_err(drvr, "setting ssid failed %d\n", err);
4597	4905	goto exit;
4598	4906	}
4599	4907	bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
..	..	@@ -4601,7 +4909,7 @@
4601	4909	err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
4602	4910	sizeof(bss_enable));
4603	4911	if (err < 0) {
4604		- brcmf_err("bss_enable config failed %d\n", err);
	4912	+ bphy_err(drvr, "bss_enable config failed %d\n", err);
4605	4913	goto exit;
4606	4914	}
4607	4915
..	..	@@ -4624,7 +4932,10 @@
4624	4932
4625	4933	static int brcmf_cfg80211_stop_ap(struct wiphy wiphy, struct net_device ndev)
4626	4934	{
	4935	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4627	4936	struct brcmf_if *ifp = netdev_priv(ndev);
	4937	+ struct brcmf_pub *drvr = cfg->pub;
	4938	+ struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
4628	4939	s32 err;
4629	4940	struct brcmf_fil_bss_enable_le bss_enable;
4630	4941	struct brcmf_join_params join_params;
..	..	@@ -4635,6 +4946,14 @@
4635	4946	/* Due to most likely deauths outstanding we sleep */
4636	4947	/* first to make sure they get processed by fw. */
4637	4948	msleep(400);
	4949	+
	4950	+ if (profile->use_fwauth != BIT(BRCMF_PROFILE_FWAUTH_NONE)) {
	4951	+ if (profile->use_fwauth & BIT(BRCMF_PROFILE_FWAUTH_PSK))
	4952	+ brcmf_set_pmk(ifp, NULL, 0);
	4953	+ if (profile->use_fwauth & BIT(BRCMF_PROFILE_FWAUTH_SAE))
	4954	+ brcmf_set_sae_password(ifp, NULL, 0);
	4955	+ profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
	4956	+ }
4638	4957
4639	4958	if (ifp->vif->mbss) {
4640	4959	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
..	..	@@ -4649,13 +4968,13 @@
4649	4968	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
4650	4969	&join_params, sizeof(join_params));
4651	4970	if (err < 0)
4652		- brcmf_err("SET SSID error (%d)\n", err);
	4971	+ bphy_err(drvr, "SET SSID error (%d)\n", err);
4653	4972	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
4654	4973	if (err < 0)
4655		- brcmf_err("BRCMF_C_DOWN error %d\n", err);
	4974	+ bphy_err(drvr, "BRCMF_C_DOWN error %d\n", err);
4656	4975	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
4657	4976	if (err < 0)
4658		- brcmf_err("setting AP mode failed %d\n", err);
	4977	+ bphy_err(drvr, "setting AP mode failed %d\n", err);
4659	4978	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
4660	4979	brcmf_fil_iovar_int_set(ifp, "mbss", 0);
4661	4980	brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
..	..	@@ -4663,7 +4982,7 @@
4663	4982	/* Bring device back up so it can be used again */
4664	4983	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
4665	4984	if (err < 0)
4666		- brcmf_err("BRCMF_C_UP error %d\n", err);
	4985	+ bphy_err(drvr, "BRCMF_C_UP error %d\n", err);
4667	4986
4668	4987	brcmf_vif_clear_mgmt_ies(ifp->vif);
4669	4988	} else {
..	..	@@ -4672,7 +4991,7 @@
4672	4991	err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
4673	4992	sizeof(bss_enable));
4674	4993	if (err < 0)
4675		- brcmf_err("bss_enable config failed %d\n", err);
	4994	+ bphy_err(drvr, "bss_enable config failed %d\n", err);
4676	4995	}
4677	4996	brcmf_set_mpc(ifp, 1);
4678	4997	brcmf_configure_arp_nd_offload(ifp, true);
..	..	@@ -4701,6 +5020,7 @@
4701	5020	struct station_del_parameters *params)
4702	5021	{
4703	5022	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5023	+ struct brcmf_pub *drvr = cfg->pub;
4704	5024	struct brcmf_scb_val_le scbval;
4705	5025	struct brcmf_if *ifp = netdev_priv(ndev);
4706	5026	s32 err;
..	..	@@ -4720,7 +5040,8 @@
4720	5040	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
4721	5041	&scbval, sizeof(scbval));
4722	5042	if (err)
4723		- brcmf_err("SCB_DEAUTHENTICATE_FOR_REASON failed %d\n", err);
	5043	+ bphy_err(drvr, "SCB_DEAUTHENTICATE_FOR_REASON failed %d\n",
	5044	+ err);
4724	5045
4725	5046	brcmf_dbg(TRACE, "Exit\n");
4726	5047	return err;
..	..	@@ -4730,6 +5051,8 @@
4730	5051	brcmf_cfg80211_change_station(struct wiphy wiphy, struct net_device ndev,
4731	5052	const u8 mac, struct station_parameters params)
4732	5053	{
	5054	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5055	+ struct brcmf_pub *drvr = cfg->pub;
4733	5056	struct brcmf_if *ifp = netdev_priv(ndev);
4734	5057	s32 err;
4735	5058
..	..	@@ -4750,27 +5073,21 @@
4750	5073	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_DEAUTHORIZE,
4751	5074	(void *)mac, ETH_ALEN);
4752	5075	if (err < 0)
4753		- brcmf_err("Setting SCB (de-)authorize failed, %d\n", err);
	5076	+ bphy_err(drvr, "Setting SCB (de-)authorize failed, %d\n", err);
4754	5077
4755	5078	return err;
4756	5079	}
4757	5080
4758	5081	static void
4759		-brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
4760		- struct wireless_dev *wdev,
4761		- u16 frame_type, bool reg)
	5082	+brcmf_cfg80211_update_mgmt_frame_registrations(struct wiphy *wiphy,
	5083	+ struct wireless_dev *wdev,
	5084	+ struct mgmt_frame_regs *upd)
4762	5085	{
4763	5086	struct brcmf_cfg80211_vif *vif;
4764		- u16 mgmt_type;
4765	5087
4766		- brcmf_dbg(TRACE, "Enter, frame_type %04x, reg=%d\n", frame_type, reg);
4767		-
4768		- mgmt_type = (frame_type & IEEE80211_FCTL_STYPE) >> 4;
4769	5088	vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
4770		- if (reg)
4771		- vif->mgmt_rx_reg \|= BIT(mgmt_type);
4772		- else
4773		- vif->mgmt_rx_reg &= ~BIT(mgmt_type);
	5089	+
	5090	+ vif->mgmt_rx_reg = upd->interface_stypes;
4774	5091	}
4775	5092
4776	5093
..	..	@@ -4780,6 +5097,7 @@
4780	5097	{
4781	5098	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4782	5099	struct ieee80211_channel *chan = params->chan;
	5100	+ struct brcmf_pub *drvr = cfg->pub;
4783	5101	const u8 *buf = params->buf;
4784	5102	size_t len = params->len;
4785	5103	const struct ieee80211_mgmt *mgmt;
..	..	@@ -4800,7 +5118,7 @@
4800	5118	mgmt = (const struct ieee80211_mgmt *)buf;
4801	5119
4802	5120	if (!ieee80211_is_mgmt(mgmt->frame_control)) {
4803		- brcmf_err("Driver only allows MGMT packet type\n");
	5121	+ bphy_err(drvr, "Driver only allows MGMT packet type\n");
4804	5122	return -EPERM;
4805	5123	}
4806	5124
..	..	@@ -4831,13 +5149,13 @@
4831	5149	GFP_KERNEL);
4832	5150	} else if (ieee80211_is_action(mgmt->frame_control)) {
4833	5151	if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
4834		- brcmf_err("invalid action frame length\n");
	5152	+ bphy_err(drvr, "invalid action frame length\n");
4835	5153	err = -EINVAL;
4836	5154	goto exit;
4837	5155	}
4838	5156	af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
4839	5157	if (af_params == NULL) {
4840		- brcmf_err("unable to allocate frame\n");
	5158	+ bphy_err(drvr, "unable to allocate frame\n");
4841	5159	err = -ENOMEM;
4842	5160	goto exit;
4843	5161	}
..	..	@@ -4859,7 +5177,7 @@
4859	5177	&freq);
4860	5178	chan_nr = ieee80211_frequency_to_channel(freq);
4861	5179	af_params->channel = cpu_to_le32(chan_nr);
4862		-
	5180	+ af_params->dwell_time = cpu_to_le32(params->wait);
4863	5181	memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN],
4864	5182	le16_to_cpu(action_frame->len));
4865	5183
..	..	@@ -4888,6 +5206,7 @@
4888	5206	u64 cookie)
4889	5207	{
4890	5208	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5209	+ struct brcmf_pub *drvr = cfg->pub;
4891	5210	struct brcmf_cfg80211_vif *vif;
4892	5211	int err = 0;
4893	5212
..	..	@@ -4895,7 +5214,7 @@
4895	5214
4896	5215	vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
4897	5216	if (vif == NULL) {
4898		- brcmf_err("No p2p device available for probe response\n");
	5217	+ bphy_err(drvr, "No p2p device available for probe response\n");
4899	5218	err = -ENODEV;
4900	5219	goto exit;
4901	5220	}
..	..	@@ -4910,20 +5229,19 @@
4910	5229	{
4911	5230	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4912	5231	struct net_device *ndev = wdev->netdev;
4913		- struct brcmf_if *ifp;
	5232	+ struct brcmf_pub *drvr = cfg->pub;
4914	5233	struct brcmu_chan ch;
4915	5234	enum nl80211_band band = 0;
4916	5235	enum nl80211_chan_width width = 0;
4917	5236	u32 chanspec;
4918	5237	int freq, err;
4919	5238
4920		- if (!ndev)
	5239	+ if (!ndev \|\| drvr->bus_if->state != BRCMF_BUS_UP)
4921	5240	return -ENODEV;
4922		- ifp = netdev_priv(ndev);
4923	5241
4924		- err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
	5242	+ err = brcmf_fil_iovar_int_get(netdev_priv(ndev), "chanspec", &chanspec);
4925	5243	if (err) {
4926		- brcmf_err("chanspec failed (%d)\n", err);
	5244	+ bphy_err(drvr, "chanspec failed (%d)\n", err);
4927	5245	return err;
4928	5246	}
4929	5247
..	..	@@ -5045,6 +5363,8 @@
5045	5363	struct net_device ndev, const u8 peer,
5046	5364	enum nl80211_tdls_operation oper)
5047	5365	{
	5366	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5367	+ struct brcmf_pub *drvr = cfg->pub;
5048	5368	struct brcmf_if *ifp;
5049	5369	struct brcmf_tdls_iovar_le info;
5050	5370	int ret = 0;
..	..	@@ -5062,7 +5382,7 @@
5062	5382	ret = brcmf_fil_iovar_data_set(ifp, "tdls_endpoint",
5063	5383	&info, sizeof(info));
5064	5384	if (ret < 0)
5065		- brcmf_err("tdls_endpoint iovar failed: ret=%d\n", ret);
	5385	+ bphy_err(drvr, "tdls_endpoint iovar failed: ret=%d\n", ret);
5066	5386
5067	5387	return ret;
5068	5388	}
..	..	@@ -5073,6 +5393,8 @@
5073	5393	struct cfg80211_connect_params *sme,
5074	5394	u32 changed)
5075	5395	{
	5396	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5397	+ struct brcmf_pub *drvr = cfg->pub;
5076	5398	struct brcmf_if *ifp;
5077	5399	int err;
5078	5400
..	..	@@ -5083,7 +5405,7 @@
5083	5405	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
5084	5406	sme->ie, sme->ie_len);
5085	5407	if (err)
5086		- brcmf_err("Set Assoc REQ IE Failed\n");
	5408	+ bphy_err(drvr, "Set Assoc REQ IE Failed\n");
5087	5409	else
5088	5410	brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
5089	5411
..	..	@@ -5095,6 +5417,8 @@
5095	5417	brcmf_cfg80211_set_rekey_data(struct wiphy wiphy, struct net_device ndev,
5096	5418	struct cfg80211_gtk_rekey_data *gtk)
5097	5419	{
	5420	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5421	+ struct brcmf_pub *drvr = cfg->pub;
5098	5422	struct brcmf_if *ifp = netdev_priv(ndev);
5099	5423	struct brcmf_gtk_keyinfo_le gtk_le;
5100	5424	int ret;
..	..	@@ -5109,7 +5433,7 @@
5109	5433	ret = brcmf_fil_iovar_data_set(ifp, "gtk_key_info", &gtk_le,
5110	5434	sizeof(gtk_le));
5111	5435	if (ret < 0)
5112		- brcmf_err("gtk_key_info iovar failed: ret=%d\n", ret);
	5436	+ bphy_err(drvr, "gtk_key_info iovar failed: ret=%d\n", ret);
5113	5437
5114	5438	return ret;
5115	5439	}
..	..	@@ -5178,7 +5502,8 @@
5178	5502	.change_station = brcmf_cfg80211_change_station,
5179	5503	.sched_scan_start = brcmf_cfg80211_sched_scan_start,
5180	5504	.sched_scan_stop = brcmf_cfg80211_sched_scan_stop,
5181		- .mgmt_frame_register = brcmf_cfg80211_mgmt_frame_register,
	5505	+ .update_mgmt_frame_registrations =
	5506	+ brcmf_cfg80211_update_mgmt_frame_registrations,
5182	5507	.mgmt_tx = brcmf_cfg80211_mgmt_tx,
5183	5508	.remain_on_channel = brcmf_p2p_remain_on_channel,
5184	5509	.cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
..	..	@@ -5212,6 +5537,7 @@
5212	5537	struct brcmf_cfg80211_vif *vif_walk;
5213	5538	struct brcmf_cfg80211_vif *vif;
5214	5539	bool mbss;
	5540	+ struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
5215	5541
5216	5542	brcmf_dbg(TRACE, "allocating virtual interface (size=%zu)\n",
5217	5543	sizeof(*vif));
..	..	@@ -5224,7 +5550,8 @@
5224	5550
5225	5551	brcmf_init_prof(&vif->profile);
5226	5552
5227		- if (type == NL80211_IFTYPE_AP) {
	5553	+ if (type == NL80211_IFTYPE_AP &&
	5554	+ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
5228	5555	mbss = false;
5229	5556	list_for_each_entry(vif_walk, &cfg->vif_list, list) {
5230	5557	if (vif_walk->wdev.iftype == NL80211_IFTYPE_AP) {
..	..	@@ -5263,14 +5590,16 @@
5263	5590	u32 event = e->event_code;
5264	5591	u32 status = e->status;
5265	5592
5266		- if (vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_PSK &&
	5593	+ if ((vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_PSK \|\|
	5594	+ vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_SAE) &&
5267	5595	event == BRCMF_E_PSK_SUP &&
5268	5596	status == BRCMF_E_STATUS_FWSUP_COMPLETED)
5269	5597	set_bit(BRCMF_VIF_STATUS_EAP_SUCCESS, &vif->sme_state);
5270	5598	if (event == BRCMF_E_SET_SSID && status == BRCMF_E_STATUS_SUCCESS) {
5271	5599	brcmf_dbg(CONN, "Processing set ssid\n");
5272	5600	memcpy(vif->profile.bssid, e->addr, ETH_ALEN);
5273		- if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_PSK)
	5601	+ if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_PSK &&
	5602	+ vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_SAE)
5274	5603	return true;
5275	5604
5276	5605	set_bit(BRCMF_VIF_STATUS_ASSOC_SUCCESS, &vif->sme_state);
..	..	@@ -5341,11 +5670,151 @@
5341	5670	conn_info->resp_ie_len = 0;
5342	5671	}
5343	5672
	5673	+u8 brcmf_map_prio_to_prec(void *config, u8 prio)
	5674	+{
	5675	+ struct brcmf_cfg80211_info cfg = (struct brcmf_cfg80211_info )config;
	5676	+
	5677	+ if (!cfg)
	5678	+ return (prio == PRIO_8021D_NONE \|\| prio == PRIO_8021D_BE) ?
	5679	+ (prio ^ 2) : prio;
	5680	+
	5681	+ /* For those AC(s) with ACM flag set to 1, convert its 4-level priority
	5682	+ * to an 8-level precedence which is the same as BE's
	5683	+ */
	5684	+ if (prio > PRIO_8021D_EE &&
	5685	+ cfg->ac_priority[prio] == cfg->ac_priority[PRIO_8021D_BE])
	5686	+ return cfg->ac_priority[prio] * 2;
	5687	+
	5688	+ /* Conversion of 4-level priority to 8-level precedence */
	5689	+ if (prio == PRIO_8021D_BE \|\| prio == PRIO_8021D_BK \|\|
	5690	+ prio == PRIO_8021D_CL \|\| prio == PRIO_8021D_VO)
	5691	+ return cfg->ac_priority[prio] * 2;
	5692	+ else
	5693	+ return cfg->ac_priority[prio] * 2 + 1;
	5694	+}
	5695	+
	5696	+u8 brcmf_map_prio_to_aci(void *config, u8 prio)
	5697	+{
	5698	+ /* Prio here refers to the 802.1d priority in range of 0 to 7.
	5699	+ * ACI here refers to the WLAN AC Index in range of 0 to 3.
	5700	+ * This function will return ACI corresponding to input prio.
	5701	+ */
	5702	+ struct brcmf_cfg80211_info cfg = (struct brcmf_cfg80211_info )config;
	5703	+
	5704	+ if (cfg)
	5705	+ return cfg->ac_priority[prio];
	5706	+
	5707	+ return prio;
	5708	+}
	5709	+
	5710	+static void brcmf_init_wmm_prio(u8 *priority)
	5711	+{
	5712	+ /* Initialize AC priority array to default
	5713	+ * 802.1d priority as per following table:
	5714	+ * 802.1d prio 0,3 maps to BE
	5715	+ * 802.1d prio 1,2 maps to BK
	5716	+ * 802.1d prio 4,5 maps to VI
	5717	+ * 802.1d prio 6,7 maps to VO
	5718	+ */
	5719	+ priority[0] = BRCMF_FWS_FIFO_AC_BE;
	5720	+ priority[3] = BRCMF_FWS_FIFO_AC_BE;
	5721	+ priority[1] = BRCMF_FWS_FIFO_AC_BK;
	5722	+ priority[2] = BRCMF_FWS_FIFO_AC_BK;
	5723	+ priority[4] = BRCMF_FWS_FIFO_AC_VI;
	5724	+ priority[5] = BRCMF_FWS_FIFO_AC_VI;
	5725	+ priority[6] = BRCMF_FWS_FIFO_AC_VO;
	5726	+ priority[7] = BRCMF_FWS_FIFO_AC_VO;
	5727	+}
	5728	+
	5729	+static void brcmf_wifi_prioritize_acparams(const
	5730	+ struct brcmf_cfg80211_edcf_acparam acp, u8 priority)
	5731	+{
	5732	+ u8 aci;
	5733	+ u8 aifsn;
	5734	+ u8 ecwmin;
	5735	+ u8 ecwmax;
	5736	+ u8 acm;
	5737	+ u8 ranking_basis[EDCF_AC_COUNT];
	5738	+ u8 aci_prio[EDCF_AC_COUNT]; /* AC_BE, AC_BK, AC_VI, AC_VO */
	5739	+ u8 index;
	5740	+
	5741	+ for (aci = 0; aci < EDCF_AC_COUNT; aci++, acp++) {
	5742	+ aifsn = acp->ACI & EDCF_AIFSN_MASK;
	5743	+ acm = (acp->ACI & EDCF_ACM_MASK) ? 1 : 0;
	5744	+ ecwmin = acp->ECW & EDCF_ECWMIN_MASK;
	5745	+ ecwmax = (acp->ECW & EDCF_ECWMAX_MASK) >> EDCF_ECWMAX_SHIFT;
	5746	+ brcmf_dbg(CONN, "ACI %d aifsn %d acm %d ecwmin %d ecwmax %d\n",
	5747	+ aci, aifsn, acm, ecwmin, ecwmax);
	5748	+ /* Default AC_VO will be the lowest ranking value */
	5749	+ ranking_basis[aci] = aifsn + ecwmin + ecwmax;
	5750	+ /* Initialise priority starting at 0 (AC_BE) */
	5751	+ aci_prio[aci] = 0;
	5752	+
	5753	+ /* If ACM is set, STA can't use this AC as per 802.11.
	5754	+ * Change the ranking to BE
	5755	+ */
	5756	+ if (aci != AC_BE && aci != AC_BK && acm == 1)
	5757	+ ranking_basis[aci] = ranking_basis[AC_BE];
	5758	+ }
	5759	+
	5760	+ /* Ranking method which works for AC priority
	5761	+ * swapping when values for cwmin, cwmax and aifsn are varied
	5762	+ * Compare each aci_prio against each other aci_prio
	5763	+ */
	5764	+ for (aci = 0; aci < EDCF_AC_COUNT; aci++) {
	5765	+ for (index = 0; index < EDCF_AC_COUNT; index++) {
	5766	+ if (index != aci) {
	5767	+ /* Smaller ranking value has higher priority,
	5768	+ * so increment priority for each ACI which has
	5769	+ * a higher ranking value
	5770	+ */
	5771	+ if (ranking_basis[aci] < ranking_basis[index])
	5772	+ aci_prio[aci]++;
	5773	+ }
	5774	+ }
	5775	+ }
	5776	+
	5777	+ /* By now, aci_prio[] will be in range of 0 to 3.
	5778	+ * Use ACI prio to get the new priority value for
	5779	+ * each 802.1d traffic type, in this range.
	5780	+ */
	5781	+ if (!(aci_prio[AC_BE] == aci_prio[AC_BK] &&
	5782	+ aci_prio[AC_BK] == aci_prio[AC_VI] &&
	5783	+ aci_prio[AC_VI] == aci_prio[AC_VO])) {
	5784	+ /* 802.1d 0,3 maps to BE */
	5785	+ priority[0] = aci_prio[AC_BE];
	5786	+ priority[3] = aci_prio[AC_BE];
	5787	+
	5788	+ /* 802.1d 1,2 maps to BK */
	5789	+ priority[1] = aci_prio[AC_BK];
	5790	+ priority[2] = aci_prio[AC_BK];
	5791	+
	5792	+ /* 802.1d 4,5 maps to VO */
	5793	+ priority[4] = aci_prio[AC_VI];
	5794	+ priority[5] = aci_prio[AC_VI];
	5795	+
	5796	+ /* 802.1d 6,7 maps to VO */
	5797	+ priority[6] = aci_prio[AC_VO];
	5798	+ priority[7] = aci_prio[AC_VO];
	5799	+ } else {
	5800	+ /* Initialize to default priority */
	5801	+ brcmf_init_wmm_prio(priority);
	5802	+ }
	5803	+
	5804	+ brcmf_dbg(CONN, "Adj prio BE 0->%d, BK 1->%d, BK 2->%d, BE 3->%d\n",
	5805	+ priority[0], priority[1], priority[2], priority[3]);
	5806	+
	5807	+ brcmf_dbg(CONN, "Adj prio VI 4->%d, VI 5->%d, VO 6->%d, VO 7->%d\n",
	5808	+ priority[4], priority[5], priority[6], priority[7]);
	5809	+}
	5810	+
5344	5811	static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
5345	5812	struct brcmf_if *ifp)
5346	5813	{
	5814	+ struct brcmf_pub *drvr = cfg->pub;
5347	5815	struct brcmf_cfg80211_assoc_ielen_le *assoc_info;
5348	5816	struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg);
	5817	+ struct brcmf_cfg80211_edcf_acparam edcf_acparam_info[EDCF_AC_COUNT];
5349	5818	u32 req_len;
5350	5819	u32 resp_len;
5351	5820	s32 err = 0;
..	..	@@ -5355,7 +5824,7 @@
5355	5824	err = brcmf_fil_iovar_data_get(ifp, "assoc_info",
5356	5825	cfg->extra_buf, WL_ASSOC_INFO_MAX);
5357	5826	if (err) {
5358		- brcmf_err("could not get assoc info (%d)\n", err);
	5827	+ bphy_err(drvr, "could not get assoc info (%d)\n", err);
5359	5828	return err;
5360	5829	}
5361	5830	assoc_info =
..	..	@@ -5367,7 +5836,7 @@
5367	5836	cfg->extra_buf,
5368	5837	WL_ASSOC_INFO_MAX);
5369	5838	if (err) {
5370		- brcmf_err("could not get assoc req (%d)\n", err);
	5839	+ bphy_err(drvr, "could not get assoc req (%d)\n", err);
5371	5840	return err;
5372	5841	}
5373	5842	conn_info->req_ie_len = req_len;
..	..	@@ -5385,7 +5854,7 @@
5385	5854	cfg->extra_buf,
5386	5855	WL_ASSOC_INFO_MAX);
5387	5856	if (err) {
5388		- brcmf_err("could not get assoc resp (%d)\n", err);
	5857	+ bphy_err(drvr, "could not get assoc resp (%d)\n", err);
5389	5858	return err;
5390	5859	}
5391	5860	conn_info->resp_ie_len = resp_len;
..	..	@@ -5394,6 +5863,17 @@
5394	5863	GFP_KERNEL);
5395	5864	if (!conn_info->resp_ie)
5396	5865	conn_info->resp_ie_len = 0;
	5866	+
	5867	+ err = brcmf_fil_iovar_data_get(ifp, "wme_ac_sta",
	5868	+ edcf_acparam_info,
	5869	+ sizeof(edcf_acparam_info));
	5870	+ if (err) {
	5871	+ brcmf_err("could not get wme_ac_sta (%d)\n", err);
	5872	+ return err;
	5873	+ }
	5874	+
	5875	+ brcmf_wifi_prioritize_acparams(edcf_acparam_info,
	5876	+ cfg->ac_priority);
5397	5877	} else {
5398	5878	conn_info->resp_ie_len = 0;
5399	5879	conn_info->resp_ie = NULL;
..	..	@@ -5467,6 +5947,11 @@
5467	5947	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
5468	5948	brcmf_dbg(CONN, "Report roaming result\n");
5469	5949
	5950	+ if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_1X && profile->is_ft) {
	5951	+ cfg80211_port_authorized(ndev, profile->bssid, GFP_KERNEL);
	5952	+ brcmf_dbg(CONN, "Report port authorized\n");
	5953	+ }
	5954	+
5470	5955	set_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state);
5471	5956	brcmf_dbg(TRACE, "Exit\n");
5472	5957	return err;
..	..	@@ -5514,6 +5999,7 @@
5514	5999	struct net_device *ndev,
5515	6000	const struct brcmf_event_msg e, void data)
5516	6001	{
	6002	+ struct brcmf_pub *drvr = cfg->pub;
5517	6003	static int generation;
5518	6004	u32 event = e->event_code;
5519	6005	u32 reason = e->reason;
..	..	@@ -5531,7 +6017,7 @@
5531	6017	if (((event == BRCMF_E_ASSOC_IND) \|\| (event == BRCMF_E_REASSOC_IND)) &&
5532	6018	(reason == BRCMF_E_STATUS_SUCCESS)) {
5533	6019	if (!data) {
5534		- brcmf_err("No IEs present in ASSOC/REASSOC_IND");
	6020	+ bphy_err(drvr, "No IEs present in ASSOC/REASSOC_IND\n");
5535	6021	return -EINVAL;
5536	6022	}
5537	6023
..	..	@@ -5589,10 +6075,19 @@
5589	6075	brcmf_net_setcarrier(ifp, true);
5590	6076	} else if (brcmf_is_linkdown(ifp->vif, e)) {
5591	6077	brcmf_dbg(CONN, "Linkdown\n");
5592		- if (!brcmf_is_ibssmode(ifp->vif)) {
	6078	+ if (!brcmf_is_ibssmode(ifp->vif) &&
	6079	+ test_bit(BRCMF_VIF_STATUS_CONNECTED,
	6080	+ &ifp->vif->sme_state)) {
	6081	+ if (memcmp(profile->bssid, e->addr, ETH_ALEN))
	6082	+ return err;
	6083	+
5593	6084	brcmf_bss_connect_done(cfg, ndev, e, false);
5594	6085	brcmf_link_down(ifp->vif,
5595		- brcmf_map_fw_linkdown_reason(e));
	6086	+ brcmf_map_fw_linkdown_reason(e),
	6087	+ e->event_code &
	6088	+ (BRCMF_E_DEAUTH_IND \|
	6089	+ BRCMF_E_DISASSOC_IND)
	6090	+ ? false : true);
5596	6091	brcmf_init_prof(ndev_to_prof(ndev));
5597	6092	if (ndev != cfg_to_ndev(cfg))
5598	6093	complete(&cfg->vif_disabled);
..	..	@@ -5804,6 +6299,7 @@
5804	6299	mutex_init(&cfg->usr_sync);
5805	6300	brcmf_init_escan(cfg);
5806	6301	brcmf_init_conf(cfg->conf);
	6302	+ brcmf_init_wmm_prio(cfg->ac_priority);
5807	6303	init_completion(&cfg->vif_disabled);
5808	6304	return err;
5809	6305	}
..	..	@@ -5823,6 +6319,7 @@
5823	6319
5824	6320	static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
5825	6321	{
	6322	+ struct brcmf_pub *drvr = ifp->drvr;
5826	6323	s32 err;
5827	6324	u32 bcn_timeout;
5828	6325	__le32 roamtrigger[2];
..	..	@@ -5835,7 +6332,7 @@
5835	6332	bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON;
5836	6333	err = brcmf_fil_iovar_int_set(ifp, "bcn_timeout", bcn_timeout);
5837	6334	if (err) {
5838		- brcmf_err("bcn_timeout error (%d)\n", err);
	6335	+ bphy_err(drvr, "bcn_timeout error (%d)\n", err);
5839	6336	goto roam_setup_done;
5840	6337	}
5841	6338
..	..	@@ -5847,7 +6344,7 @@
5847	6344	err = brcmf_fil_iovar_int_set(ifp, "roam_off",
5848	6345	ifp->drvr->settings->roamoff);
5849	6346	if (err) {
5850		- brcmf_err("roam_off error (%d)\n", err);
	6347	+ bphy_err(drvr, "roam_off error (%d)\n", err);
5851	6348	goto roam_setup_done;
5852	6349	}
5853	6350
..	..	@@ -5855,19 +6352,17 @@
5855	6352	roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL);
5856	6353	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
5857	6354	(void *)roamtrigger, sizeof(roamtrigger));
5858		- if (err) {
5859		- brcmf_err("WLC_SET_ROAM_TRIGGER error (%d)\n", err);
5860		- goto roam_setup_done;
5861		- }
	6355	+ if (err)
	6356	+ bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
5862	6357
5863	6358	roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA);
5864	6359	roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL);
5865	6360	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
5866	6361	(void *)roam_delta, sizeof(roam_delta));
5867		- if (err) {
5868		- brcmf_err("WLC_SET_ROAM_DELTA error (%d)\n", err);
5869		- goto roam_setup_done;
5870		- }
	6362	+ if (err)
	6363	+ bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
	6364	+
	6365	+ return 0;
5871	6366
5872	6367	roam_setup_done:
5873	6368	return err;
..	..	@@ -5876,25 +6371,26 @@
5876	6371	static s32
5877	6372	brcmf_dongle_scantime(struct brcmf_if *ifp)
5878	6373	{
	6374	+ struct brcmf_pub *drvr = ifp->drvr;
5879	6375	s32 err = 0;
5880	6376
5881	6377	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
5882	6378	BRCMF_SCAN_CHANNEL_TIME);
5883	6379	if (err) {
5884		- brcmf_err("Scan assoc time error (%d)\n", err);
	6380	+ bphy_err(drvr, "Scan assoc time error (%d)\n", err);
5885	6381	goto dongle_scantime_out;
5886	6382	}
5887	6383	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
5888	6384	BRCMF_SCAN_UNASSOC_TIME);
5889	6385	if (err) {
5890		- brcmf_err("Scan unassoc time error (%d)\n", err);
	6386	+ bphy_err(drvr, "Scan unassoc time error (%d)\n", err);
5891	6387	goto dongle_scantime_out;
5892	6388	}
5893	6389
5894	6390	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_PASSIVE_TIME,
5895	6391	BRCMF_SCAN_PASSIVE_TIME);
5896	6392	if (err) {
5897		- brcmf_err("Scan passive time error (%d)\n", err);
	6393	+ bphy_err(drvr, "Scan passive time error (%d)\n", err);
5898	6394	goto dongle_scantime_out;
5899	6395	}
5900	6396
..	..	@@ -5926,10 +6422,11 @@
5926	6422	static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
5927	6423	u32 bw_cap[])
5928	6424	{
5929		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	6425	+ struct wiphy *wiphy = cfg_to_wiphy(cfg);
	6426	+ struct brcmf_pub *drvr = cfg->pub;
	6427	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
5930	6428	struct ieee80211_supported_band *band;
5931	6429	struct ieee80211_channel *channel;
5932		- struct wiphy *wiphy;
5933	6430	struct brcmf_chanspec_list *list;
5934	6431	struct brcmu_chan ch;
5935	6432	int err;
..	..	@@ -5948,11 +6445,10 @@
5948	6445	err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
5949	6446	BRCMF_DCMD_MEDLEN);
5950	6447	if (err) {
5951		- brcmf_err("get chanspecs error (%d)\n", err);
	6448	+ bphy_err(drvr, "get chanspecs error (%d)\n", err);
5952	6449	goto fail_pbuf;
5953	6450	}
5954	6451
5955		- wiphy = cfg_to_wiphy(cfg);
5956	6452	band = wiphy->bands[NL80211_BAND_2GHZ];
5957	6453	if (band)
5958	6454	for (i = 0; i < band->n_channels; i++)
..	..	@@ -5972,7 +6468,8 @@
5972	6468	} else if (ch.band == BRCMU_CHAN_BAND_5G) {
5973	6469	band = wiphy->bands[NL80211_BAND_5GHZ];
5974	6470	} else {
5975		- brcmf_err("Invalid channel Spec. 0x%x.\n", ch.chspec);
	6471	+ bphy_err(drvr, "Invalid channel Spec. 0x%x.\n",
	6472	+ ch.chspec);
5976	6473	continue;
5977	6474	}
5978	6475	if (!band)
..	..	@@ -5995,8 +6492,8 @@
5995	6492	/* It seems firmware supports some channel we never
5996	6493	* considered. Something new in IEEE standard?
5997	6494	*/
5998		- brcmf_err("Ignoring unexpected firmware channel %d\n",
5999		- ch.control_ch_num);
	6495	+ bphy_err(drvr, "Ignoring unexpected firmware channel %d\n",
	6496	+ ch.control_ch_num);
6000	6497	continue;
6001	6498	}
6002	6499
..	..	@@ -6006,11 +6503,21 @@
6006	6503	/* assuming the chanspecs order is HT20,
6007	6504	* HT40 upper, HT40 lower, and VHT80.
6008	6505	*/
6009		- if (ch.bw == BRCMU_CHAN_BW_80) {
	6506	+ switch (ch.bw) {
	6507	+ case BRCMU_CHAN_BW_160:
	6508	+ channel->flags &= ~IEEE80211_CHAN_NO_160MHZ;
	6509	+ break;
	6510	+ case BRCMU_CHAN_BW_80:
6010	6511	channel->flags &= ~IEEE80211_CHAN_NO_80MHZ;
6011		- } else if (ch.bw == BRCMU_CHAN_BW_40) {
	6512	+ break;
	6513	+ case BRCMU_CHAN_BW_40:
6012	6514	brcmf_update_bw40_channel_flag(channel, &ch);
6013		- } else {
	6515	+ break;
	6516	+ default:
	6517	+ wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n",
	6518	+ ch.bw);
	6519	+ fallthrough;
	6520	+ case BRCMU_CHAN_BW_20:
6014	6521	/* enable the channel and disable other bandwidths
6015	6522	* for now as mentioned order assure they are enabled
6016	6523	* for subsequent chanspecs.
..	..	@@ -6042,7 +6549,8 @@
6042	6549
6043	6550	static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
6044	6551	{
6045		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	6552	+ struct brcmf_pub *drvr = cfg->pub;
	6553	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
6046	6554	struct ieee80211_supported_band *band;
6047	6555	struct brcmf_fil_bwcap_le band_bwcap;
6048	6556	struct brcmf_chanspec_list *list;
..	..	@@ -6088,7 +6596,7 @@
6088	6596	err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
6089	6597	BRCMF_DCMD_MEDLEN);
6090	6598	if (err) {
6091		- brcmf_err("get chanspecs error (%d)\n", err);
	6599	+ bphy_err(drvr, "get chanspecs error (%d)\n", err);
6092	6600	kfree(pbuf);
6093	6601	return err;
6094	6602	}
..	..	@@ -6119,6 +6627,7 @@
6119	6627
6120	6628	static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
6121	6629	{
	6630	+ struct brcmf_pub *drvr = ifp->drvr;
6122	6631	u32 band, mimo_bwcap;
6123	6632	int err;
6124	6633
..	..	@@ -6145,16 +6654,16 @@
6145	6654	switch (mimo_bwcap) {
6146	6655	case WLC_N_BW_40ALL:
6147	6656	bw_cap[NL80211_BAND_2GHZ] \|= WLC_BW_40MHZ_BIT;
6148		- /* fall-thru */
	6657	+ fallthrough;
6149	6658	case WLC_N_BW_20IN2G_40IN5G:
6150	6659	bw_cap[NL80211_BAND_5GHZ] \|= WLC_BW_40MHZ_BIT;
6151		- /* fall-thru */
	6660	+ fallthrough;
6152	6661	case WLC_N_BW_20ALL:
6153	6662	bw_cap[NL80211_BAND_2GHZ] \|= WLC_BW_20MHZ_BIT;
6154	6663	bw_cap[NL80211_BAND_5GHZ] \|= WLC_BW_20MHZ_BIT;
6155	6664	break;
6156	6665	default:
6157		- brcmf_err("invalid mimo_bw_cap value\n");
	6666	+ bphy_err(drvr, "invalid mimo_bw_cap value\n");
6158	6667	}
6159	6668	}
6160	6669
..	..	@@ -6229,8 +6738,9 @@
6229	6738
6230	6739	static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
6231	6740	{
6232		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
6233		- struct wiphy *wiphy;
	6741	+ struct brcmf_pub *drvr = cfg->pub;
	6742	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
	6743	+ struct wiphy *wiphy = cfg_to_wiphy(cfg);
6234	6744	u32 nmode = 0;
6235	6745	u32 vhtmode = 0;
6236	6746	u32 bw_cap[2] = { WLC_BW_20MHZ_BIT, WLC_BW_20MHZ_BIT };
..	..	@@ -6246,7 +6756,7 @@
6246	6756	(void)brcmf_fil_iovar_int_get(ifp, "vhtmode", &vhtmode);
6247	6757	err = brcmf_fil_iovar_int_get(ifp, "nmode", &nmode);
6248	6758	if (err) {
6249		- brcmf_err("nmode error (%d)\n", err);
	6759	+ bphy_err(drvr, "nmode error (%d)\n", err);
6250	6760	} else {
6251	6761	brcmf_get_bwcap(ifp, bw_cap);
6252	6762	}
..	..	@@ -6256,7 +6766,7 @@
6256	6766
6257	6767	err = brcmf_fil_iovar_int_get(ifp, "rxchain", &rxchain);
6258	6768	if (err) {
6259		- brcmf_err("rxchain error (%d)\n", err);
	6769	+ bphy_err(drvr, "rxchain error (%d)\n", err);
6260	6770	nchain = 1;
6261	6771	} else {
6262	6772	for (nchain = 0; rxchain; nchain++)
..	..	@@ -6266,7 +6776,7 @@
6266	6776
6267	6777	err = brcmf_construct_chaninfo(cfg, bw_cap);
6268	6778	if (err) {
6269		- brcmf_err("brcmf_construct_chaninfo failed (%d)\n", err);
	6779	+ bphy_err(drvr, "brcmf_construct_chaninfo failed (%d)\n", err);
6270	6780	return err;
6271	6781	}
6272	6782
..	..	@@ -6278,7 +6788,6 @@
6278	6788	&txbf_bfr_cap);
6279	6789	}
6280	6790
6281		- wiphy = cfg_to_wiphy(cfg);
6282	6791	for (i = 0; i < ARRAY_SIZE(wiphy->bands); i++) {
6283	6792	band = wiphy->bands[i];
6284	6793	if (band == NULL)
..	..	@@ -6351,6 +6860,9 @@
6351	6860	* #STA <= 1, #AP <= 1, channels = 1, 2 total
6352	6861	* #AP <= 4, matching BI, channels = 1, 4 total
6353	6862	*
	6863	+ * no p2p and rsdb:
	6864	+ * #STA <= 1, #AP <= 2, channels = 2, 4 total
	6865	+ *
6354	6866	* p2p, no mchan, and mbss:
6355	6867	*
6356	6868	* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 1, 3 total
..	..	@@ -6362,6 +6874,10 @@
6362	6874	* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 2, 3 total
6363	6875	* #STA <= 1, #P2P-DEV <= 1, #AP <= 1, #P2P-CL <= 1, channels = 1, 4 total
6364	6876	* #AP <= 4, matching BI, channels = 1, 4 total
	6877	+ *
	6878	+ * p2p, rsdb, and no mbss:
	6879	+ * #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 2, AP <= 2,
	6880	+ * channels = 2, 4 total
6365	6881	*/
6366	6882	static int brcmf_setup_ifmodes(struct wiphy wiphy, struct brcmf_if ifp)
6367	6883	{
..	..	@@ -6369,13 +6885,16 @@
6369	6885	struct ieee80211_iface_limit *c0_limits = NULL;
6370	6886	struct ieee80211_iface_limit *p2p_limits = NULL;
6371	6887	struct ieee80211_iface_limit *mbss_limits = NULL;
6372		- bool mbss, p2p;
6373		- int i, c, n_combos;
	6888	+ bool mon_flag, mbss, p2p, rsdb, mchan;
	6889	+ int i, c, n_combos, n_limits;
6374	6890
	6891	+ mon_flag = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MONITOR_FLAG);
6375	6892	mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS);
6376	6893	p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P);
	6894	+ rsdb = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB);
	6895	+ mchan = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN);
6377	6896
6378		- n_combos = 1 + !!p2p + !!mbss;
	6897	+ n_combos = 1 + !!(p2p && !rsdb) + !!mbss;
6379	6898	combo = kcalloc(n_combos, sizeof(*combo), GFP_KERNEL);
6380	6899	if (!combo)
6381	6900	goto err;
..	..	@@ -6383,37 +6902,53 @@
6383	6902	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
6384	6903	BIT(NL80211_IFTYPE_ADHOC) \|
6385	6904	BIT(NL80211_IFTYPE_AP);
6386		-
6387		- c = 0;
6388		- i = 0;
6389		- c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
6390		- if (!c0_limits)
6391		- goto err;
6392		- c0_limits[i].max = 1;
6393		- c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
6394		- if (p2p) {
6395		- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
6396		- combo[c].num_different_channels = 2;
6397		- else
6398		- combo[c].num_different_channels = 1;
	6905	+ if (mon_flag)
	6906	+ wiphy->interface_modes \|= BIT(NL80211_IFTYPE_MONITOR);
	6907	+ if (p2p)
6399	6908	wiphy->interface_modes \|= BIT(NL80211_IFTYPE_P2P_CLIENT) \|
6400	6909	BIT(NL80211_IFTYPE_P2P_GO) \|
6401	6910	BIT(NL80211_IFTYPE_P2P_DEVICE);
	6911	+
	6912	+ c = 0;
	6913	+ i = 0;
	6914	+ n_limits = 1 + mon_flag + (p2p ? 2 : 0) + (rsdb \|\| !p2p);
	6915	+ c0_limits = kcalloc(n_limits, sizeof(*c0_limits), GFP_KERNEL);
	6916	+ if (!c0_limits)
	6917	+ goto err;
	6918	+
	6919	+ combo[c].num_different_channels = 1 + (rsdb \|\| (p2p && mchan));
	6920	+ c0_limits[i].max = 1;
	6921	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
	6922	+ if (mon_flag) {
	6923	+ c0_limits[i].max = 1;
	6924	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);
	6925	+ }
	6926	+ if (p2p) {
6402	6927	c0_limits[i].max = 1;
6403	6928	c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
6404		- c0_limits[i].max = 1;
	6929	+ c0_limits[i].max = 1 + rsdb;
6405	6930	c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) \|
6406	6931	BIT(NL80211_IFTYPE_P2P_GO);
	6932	+ }
	6933	+ if (p2p && rsdb) {
	6934	+ c0_limits[i].max = 2;
	6935	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6936	+ combo[c].max_interfaces = 4;
	6937	+ } else if (p2p) {
	6938	+ combo[c].max_interfaces = i;
	6939	+ } else if (rsdb) {
	6940	+ c0_limits[i].max = 2;
	6941	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6942	+ combo[c].max_interfaces = 3;
6407	6943	} else {
6408		- combo[c].num_different_channels = 1;
6409	6944	c0_limits[i].max = 1;
6410	6945	c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6946	+ combo[c].max_interfaces = i;
6411	6947	}
6412		- combo[c].max_interfaces = i;
6413	6948	combo[c].n_limits = i;
6414	6949	combo[c].limits = c0_limits;
6415	6950
6416		- if (p2p) {
	6951	+ if (p2p && !rsdb) {
6417	6952	c++;
6418	6953	i = 0;
6419	6954	p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
..	..	@@ -6436,14 +6971,20 @@
6436	6971	if (mbss) {
6437	6972	c++;
6438	6973	i = 0;
6439		- mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
	6974	+ n_limits = 1 + mon_flag;
	6975	+ mbss_limits = kcalloc(n_limits, sizeof(*mbss_limits),
	6976	+ GFP_KERNEL);
6440	6977	if (!mbss_limits)
6441	6978	goto err;
6442	6979	mbss_limits[i].max = 4;
6443	6980	mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6981	+ if (mon_flag) {
	6982	+ mbss_limits[i].max = 1;
	6983	+ mbss_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);
	6984	+ }
6444	6985	combo[c].beacon_int_infra_match = true;
6445	6986	combo[c].num_different_channels = 1;
6446		- combo[c].max_interfaces = 4;
	6987	+ combo[c].max_interfaces = 4 + mon_flag;
6447	6988	combo[c].n_limits = i;
6448	6989	combo[c].limits = mbss_limits;
6449	6990	}
..	..	@@ -6474,12 +7015,13 @@
6474	7015	{
6475	7016	#ifdef CONFIG_PM
6476	7017	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	7018	+ struct brcmf_pub *drvr = cfg->pub;
6477	7019	struct wiphy_wowlan_support *wowl;
6478	7020
6479	7021	wowl = kmemdup(&brcmf_wowlan_support, sizeof(brcmf_wowlan_support),
6480	7022	GFP_KERNEL);
6481	7023	if (!wowl) {
6482		- brcmf_err("only support basic wowlan features\n");
	7024	+ bphy_err(drvr, "only support basic wowlan features\n");
6483	7025	wiphy->wowlan = &brcmf_wowlan_support;
6484	7026	return;
6485	7027	}
..	..	@@ -6560,6 +7102,16 @@
6560	7102	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK);
6561	7103	wiphy_ext_feature_set(wiphy,
6562	7104	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X);
	7105	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SAE))
	7106	+ wiphy_ext_feature_set(wiphy,
	7107	+ NL80211_EXT_FEATURE_SAE_OFFLOAD);
	7108	+ }
	7109	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_FWAUTH)) {
	7110	+ wiphy_ext_feature_set(wiphy,
	7111	+ NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK);
	7112	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SAE))
	7113	+ wiphy_ext_feature_set(wiphy,
	7114	+ NL80211_EXT_FEATURE_SAE_OFFLOAD_AP);
6563	7115	}
6564	7116	wiphy->mgmt_stypes = brcmf_txrx_stypes;
6565	7117	wiphy->max_remain_on_channel_duration = 5000;
..	..	@@ -6576,7 +7128,7 @@
6576	7128	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST, &bandlist,
6577	7129	sizeof(bandlist));
6578	7130	if (err) {
6579		- brcmf_err("could not obtain band info: err=%d\n", err);
	7131	+ bphy_err(drvr, "could not obtain band info: err=%d\n", err);
6580	7132	return err;
6581	7133	}
6582	7134	/* first entry in bandlist is number of bands */
..	..	@@ -6618,6 +7170,11 @@
6618	7170	}
6619	7171	}
6620	7172
	7173	+ if (wiphy->bands[NL80211_BAND_5GHZ] &&
	7174	+ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DOT11H))
	7175	+ wiphy_ext_feature_set(wiphy,
	7176	+ NL80211_EXT_FEATURE_DFS_OFFLOAD);
	7177	+
6621	7178	wiphy_read_of_freq_limits(wiphy);
6622	7179
6623	7180	return 0;
..	..	@@ -6625,6 +7182,7 @@
6625	7182
6626	7183	static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
6627	7184	{
	7185	+ struct brcmf_pub *drvr = cfg->pub;
6628	7186	struct net_device *ndev;
6629	7187	struct wireless_dev *wdev;
6630	7188	struct brcmf_if *ifp;
..	..	@@ -6660,6 +7218,12 @@
6660	7218
6661	7219	brcmf_configure_arp_nd_offload(ifp, true);
6662	7220
	7221	+ err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_FAKEFRAG, 1);
	7222	+ if (err) {
	7223	+ bphy_err(drvr, "failed to set frameburst mode\n");
	7224	+ goto default_conf_out;
	7225	+ }
	7226	+
6663	7227	cfg->dongle_up = true;
6664	7228	default_conf_out:
6665	7229
..	..	@@ -6683,7 +7247,7 @@
6683	7247	* from AP to save power
6684	7248	*/
6685	7249	if (check_vif_up(ifp->vif)) {
6686		- brcmf_link_down(ifp->vif, WLAN_REASON_UNSPECIFIED);
	7250	+ brcmf_link_down(ifp->vif, WLAN_REASON_UNSPECIFIED, true);
6687	7251
6688	7252	/* Make sure WPA_Supplicant receives all the event
6689	7253	generated due to DISASSOC call to the fw to keep
..	..	@@ -6837,6 +7401,7 @@
6837	7401	{
6838	7402	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
6839	7403	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	7404	+ struct brcmf_pub *drvr = cfg->pub;
6840	7405	struct brcmf_fil_country_le ccreq;
6841	7406	s32 err;
6842	7407	int i;
..	..	@@ -6848,8 +7413,8 @@
6848	7413	/* ignore non-ISO3166 country codes */
6849	7414	for (i = 0; i < 2; i++)
6850	7415	if (req->alpha2[i] < 'A' \|\| req->alpha2[i] > 'Z') {
6851		- brcmf_err("not an ISO3166 code (0x%02x 0x%02x)\n",
6852		- req->alpha2[0], req->alpha2[1]);
	7416	+ bphy_err(drvr, "not an ISO3166 code (0x%02x 0x%02x)\n",
	7417	+ req->alpha2[0], req->alpha2[1]);
6853	7418	return;
6854	7419	}
6855	7420
..	..	@@ -6858,7 +7423,7 @@
6858	7423
6859	7424	err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
6860	7425	if (err) {
6861		- brcmf_err("Country code iovar returned err = %d\n", err);
	7426	+ bphy_err(drvr, "Country code iovar returned err = %d\n", err);
6862	7427	return;
6863	7428	}
6864	7429
..	..	@@ -6868,7 +7433,7 @@
6868	7433
6869	7434	err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
6870	7435	if (err) {
6871		- brcmf_err("Firmware rejected country setting\n");
	7436	+ bphy_err(drvr, "Firmware rejected country setting\n");
6872	7437	return;
6873	7438	}
6874	7439	brcmf_setup_wiphybands(cfg);
..	..	@@ -6914,13 +7479,13 @@
6914	7479	u16 *cap = NULL;
6915	7480
6916	7481	if (!ndev) {
6917		- brcmf_err("ndev is invalid\n");
	7482	+ bphy_err(drvr, "ndev is invalid\n");
6918	7483	return NULL;
6919	7484	}
6920	7485
6921	7486	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
6922	7487	if (!cfg) {
6923		- brcmf_err("Could not allocate wiphy device\n");
	7488	+ bphy_err(drvr, "Could not allocate wiphy device\n");
6924	7489	return NULL;
6925	7490	}
6926	7491
..	..	@@ -6941,7 +7506,7 @@
6941	7506
6942	7507	err = wl_init_priv(cfg);
6943	7508	if (err) {
6944		- brcmf_err("Failed to init iwm_priv (%d)\n", err);
	7509	+ bphy_err(drvr, "Failed to init iwm_priv (%d)\n", err);
6945	7510	brcmf_free_vif(vif);
6946	7511	goto wiphy_out;
6947	7512	}
..	..	@@ -6950,7 +7515,7 @@
6950	7515	/* determine d11 io type before wiphy setup */
6951	7516	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION, &io_type);
6952	7517	if (err) {
6953		- brcmf_err("Failed to get D11 version (%d)\n", err);
	7518	+ bphy_err(drvr, "Failed to get D11 version (%d)\n", err);
6954	7519	goto priv_out;
6955	7520	}
6956	7521	cfg->d11inf.io_type = (u8)io_type;
..	..	@@ -6984,13 +7549,13 @@
6984	7549	#endif
6985	7550	err = wiphy_register(wiphy);
6986	7551	if (err < 0) {
6987		- brcmf_err("Could not register wiphy device (%d)\n", err);
	7552	+ bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
6988	7553	goto priv_out;
6989	7554	}
6990	7555
6991	7556	err = brcmf_setup_wiphybands(cfg);
6992	7557	if (err) {
6993		- brcmf_err("Setting wiphy bands failed (%d)\n", err);
	7558	+ bphy_err(drvr, "Setting wiphy bands failed (%d)\n", err);
6994	7559	goto wiphy_unreg_out;
6995	7560	}
6996	7561
..	..	@@ -7008,24 +7573,24 @@
7008	7573
7009	7574	err = brcmf_fweh_activate_events(ifp);
7010	7575	if (err) {
7011		- brcmf_err("FWEH activation failed (%d)\n", err);
	7576	+ bphy_err(drvr, "FWEH activation failed (%d)\n", err);
7012	7577	goto wiphy_unreg_out;
7013	7578	}
7014	7579
7015	7580	err = brcmf_p2p_attach(cfg, p2pdev_forced);
7016	7581	if (err) {
7017		- brcmf_err("P2P initialisation failed (%d)\n", err);
	7582	+ bphy_err(drvr, "P2P initialisation failed (%d)\n", err);
7018	7583	goto wiphy_unreg_out;
7019	7584	}
7020	7585	err = brcmf_btcoex_attach(cfg);
7021	7586	if (err) {
7022		- brcmf_err("BT-coex initialisation failed (%d)\n", err);
	7587	+ bphy_err(drvr, "BT-coex initialisation failed (%d)\n", err);
7023	7588	brcmf_p2p_detach(&cfg->p2p);
7024	7589	goto wiphy_unreg_out;
7025	7590	}
7026	7591	err = brcmf_pno_attach(cfg);
7027	7592	if (err) {
7028		- brcmf_err("PNO initialisation failed (%d)\n", err);
	7593	+ bphy_err(drvr, "PNO initialisation failed (%d)\n", err);
7029	7594	brcmf_btcoex_detach(cfg);
7030	7595	brcmf_p2p_detach(&cfg->p2p);
7031	7596	goto wiphy_unreg_out;
..	..	@@ -7045,7 +7610,7 @@
7045	7610	/* (re-) activate FWEH event handling */
7046	7611	err = brcmf_fweh_activate_events(ifp);
7047	7612	if (err) {
7048		- brcmf_err("FWEH activation failed (%d)\n", err);
	7613	+ bphy_err(drvr, "FWEH activation failed (%d)\n", err);
7049	7614	goto detach;
7050	7615	}
7051	7616
..	..	@@ -7085,7 +7650,6 @@
7085	7650	brcmf_pno_detach(cfg);
7086	7651	brcmf_btcoex_detach(cfg);
7087	7652	wiphy_unregister(cfg->wiphy);
7088		- kfree(cfg->ops);
7089	7653	wl_deinit_priv(cfg);
7090	7654	brcmf_free_wiphy(cfg->wiphy);
7091	7655	kfree(cfg);