~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)
..	..	@@ -93,8 +85,13 @@
93	85
94	86	#define BRCMF_ND_INFO_TIMEOUT msecs_to_jiffies(2000)
95	87
	88	+#define BRCMF_PS_MAX_TIMEOUT_MS 2000
	89	+
96	90	#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
97	91	(sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
	92	+
	93	+#define BRCMF_MAX_CHANSPEC_LIST \
	94	+ (BRCMF_DCMD_MEDLEN / sizeof(__le32) - 1)
98	95
99	96	static bool check_vif_up(struct brcmf_cfg80211_vif *vif)
100	97	{
..	..	@@ -200,9 +197,9 @@
200	197	*/
201	198	REG_RULE(2484-10, 2484+10, 20, 6, 20, 0),
202	199	/* IEEE 802.11a, channel 36..64 */
203		- REG_RULE(5150-10, 5350+10, 80, 6, 20, 0),
	200	+ REG_RULE(5150-10, 5350+10, 160, 6, 20, 0),
204	201	/* IEEE 802.11a, channel 100..165 */
205		- REG_RULE(5470-10, 5850+10, 80, 6, 20, 0), }
	202	+ REG_RULE(5470-10, 5850+10, 160, 6, 20, 0), }
206	203	};
207	204
208	205	/* Note: brcmf_cipher_suites is an array of int defining which cipher suites
..	..	@@ -287,8 +284,26 @@
287	284	else
288	285	ch_inf.sb = BRCMU_CHAN_SB_UU;
289	286	break;
290		- case NL80211_CHAN_WIDTH_80P80:
291	287	case NL80211_CHAN_WIDTH_160:
	288	+ ch_inf.bw = BRCMU_CHAN_BW_160;
	289	+ if (primary_offset == -70)
	290	+ ch_inf.sb = BRCMU_CHAN_SB_LLL;
	291	+ else if (primary_offset == -50)
	292	+ ch_inf.sb = BRCMU_CHAN_SB_LLU;
	293	+ else if (primary_offset == -30)
	294	+ ch_inf.sb = BRCMU_CHAN_SB_LUL;
	295	+ else if (primary_offset == -10)
	296	+ ch_inf.sb = BRCMU_CHAN_SB_LUU;
	297	+ else if (primary_offset == 10)
	298	+ ch_inf.sb = BRCMU_CHAN_SB_ULL;
	299	+ else if (primary_offset == 30)
	300	+ ch_inf.sb = BRCMU_CHAN_SB_ULU;
	301	+ else if (primary_offset == 50)
	302	+ ch_inf.sb = BRCMU_CHAN_SB_UUL;
	303	+ else
	304	+ ch_inf.sb = BRCMU_CHAN_SB_UUU;
	305	+ break;
	306	+ case NL80211_CHAN_WIDTH_80P80:
292	307	case NL80211_CHAN_WIDTH_5:
293	308	case NL80211_CHAN_WIDTH_10:
294	309	default:
..	..	@@ -307,6 +322,7 @@
307	322	}
308	323	d11inf->encchspec(&ch_inf);
309	324
	325	+ brcmf_dbg(TRACE, "chanspec: 0x%x\n", ch_inf.chspec);
310	326	return ch_inf.chspec;
311	327	}
312	328
..	..	@@ -457,6 +473,7 @@
457	473	static int
458	474	send_key_to_dongle(struct brcmf_if ifp, struct brcmf_wsec_key key)
459	475	{
	476	+ struct brcmf_pub *drvr = ifp->drvr;
460	477	int err;
461	478	struct brcmf_wsec_key_le key_le;
462	479
..	..	@@ -468,7 +485,7 @@
468	485	sizeof(key_le));
469	486
470	487	if (err)
471		- brcmf_err("wsec_key error (%d)\n", err);
	488	+ bphy_err(drvr, "wsec_key error (%d)\n", err);
472	489	return err;
473	490	}
474	491
..	..	@@ -508,6 +525,7 @@
508	525
509	526	static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
510	527	{
	528	+ struct brcmf_pub *drvr = ifp->drvr;
511	529	struct brcmf_mbss_ssid_le mbss_ssid_le;
512	530	int bsscfgidx;
513	531	int err;
..	..	@@ -524,7 +542,7 @@
524	542	err = brcmf_fil_bsscfg_data_set(ifp, "bsscfg:ssid", &mbss_ssid_le,
525	543	sizeof(mbss_ssid_le));
526	544	if (err < 0)
527		- brcmf_err("setting ssid failed %d\n", err);
	545	+ bphy_err(drvr, "setting ssid failed %d\n", err);
528	546
529	547	return err;
530	548	}
..	..	@@ -542,6 +560,7 @@
542	560	{
543	561	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
544	562	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
	563	+ struct brcmf_pub *drvr = cfg->pub;
545	564	struct brcmf_cfg80211_vif *vif;
546	565	int err;
547	566
..	..	@@ -567,7 +586,7 @@
567	586	BRCMF_VIF_EVENT_TIMEOUT);
568	587	brcmf_cfg80211_arm_vif_event(cfg, NULL);
569	588	if (!err) {
570		- brcmf_err("timeout occurred\n");
	589	+ bphy_err(drvr, "timeout occurred\n");
571	590	err = -EIO;
572	591	goto fail;
573	592	}
..	..	@@ -575,7 +594,7 @@
575	594	/* interface created in firmware */
576	595	ifp = vif->ifp;
577	596	if (!ifp) {
578		- brcmf_err("no if pointer provided\n");
	597	+ bphy_err(drvr, "no if pointer provided\n");
579	598	err = -ENOENT;
580	599	goto fail;
581	600	}
..	..	@@ -583,7 +602,7 @@
583	602	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
584	603	err = brcmf_net_attach(ifp, true);
585	604	if (err) {
586		- brcmf_err("Registering netdevice failed\n");
	605	+ bphy_err(drvr, "Registering netdevice failed\n");
587	606	free_netdev(ifp->ndev);
588	607	goto fail;
589	608	}
..	..	@@ -608,19 +627,97 @@
608	627	return vif->wdev.iftype == NL80211_IFTYPE_ADHOC;
609	628	}
610	629
	630	+/**
	631	+ * brcmf_mon_add_vif() - create monitor mode virtual interface
	632	+ *
	633	+ * @wiphy: wiphy device of new interface.
	634	+ * @name: name of the new interface.
	635	+ */
	636	+static struct wireless_dev brcmf_mon_add_vif(struct wiphy wiphy,
	637	+ const char *name)
	638	+{
	639	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	640	+ struct brcmf_cfg80211_vif *vif;
	641	+ struct net_device *ndev;
	642	+ struct brcmf_if *ifp;
	643	+ int err;
	644	+
	645	+ if (cfg->pub->mon_if) {
	646	+ err = -EEXIST;
	647	+ goto err_out;
	648	+ }
	649	+
	650	+ vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_MONITOR);
	651	+ if (IS_ERR(vif)) {
	652	+ err = PTR_ERR(vif);
	653	+ goto err_out;
	654	+ }
	655	+
	656	+ ndev = alloc_netdev(sizeof(*ifp), name, NET_NAME_UNKNOWN, ether_setup);
	657	+ if (!ndev) {
	658	+ err = -ENOMEM;
	659	+ goto err_free_vif;
	660	+ }
	661	+ ndev->type = ARPHRD_IEEE80211_RADIOTAP;
	662	+ ndev->ieee80211_ptr = &vif->wdev;
	663	+ ndev->needs_free_netdev = true;
	664	+ ndev->priv_destructor = brcmf_cfg80211_free_netdev;
	665	+ SET_NETDEV_DEV(ndev, wiphy_dev(cfg->wiphy));
	666	+
	667	+ ifp = netdev_priv(ndev);
	668	+ ifp->vif = vif;
	669	+ ifp->ndev = ndev;
	670	+ ifp->drvr = cfg->pub;
	671	+
	672	+ vif->ifp = ifp;
	673	+ vif->wdev.netdev = ndev;
	674	+
	675	+ err = brcmf_net_mon_attach(ifp);
	676	+ if (err) {
	677	+ brcmf_err("Failed to attach %s device\n", ndev->name);
	678	+ free_netdev(ndev);
	679	+ goto err_free_vif;
	680	+ }
	681	+
	682	+ cfg->pub->mon_if = ifp;
	683	+
	684	+ return &vif->wdev;
	685	+
	686	+err_free_vif:
	687	+ brcmf_free_vif(vif);
	688	+err_out:
	689	+ return ERR_PTR(err);
	690	+}
	691	+
	692	+static int brcmf_mon_del_vif(struct wiphy wiphy, struct wireless_dev wdev)
	693	+{
	694	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	695	+ struct net_device *ndev = wdev->netdev;
	696	+
	697	+ ndev->netdev_ops->ndo_stop(ndev);
	698	+
	699	+ brcmf_net_detach(ndev, true);
	700	+
	701	+ cfg->pub->mon_if = NULL;
	702	+
	703	+ return 0;
	704	+}
	705	+
611	706	static struct wireless_dev brcmf_cfg80211_add_iface(struct wiphy wiphy,
612	707	const char *name,
613	708	unsigned char name_assign_type,
614	709	enum nl80211_iftype type,
615	710	struct vif_params *params)
616	711	{
	712	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	713	+ struct brcmf_pub *drvr = cfg->pub;
617	714	struct wireless_dev *wdev;
618	715	int err;
619	716
620	717	brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
621	718	err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
622	719	if (err) {
623		- brcmf_err("iface validation failed: err=%d\n", err);
	720	+ bphy_err(drvr, "iface validation failed: err=%d\n", err);
624	721	return ERR_PTR(err);
625	722	}
626	723	switch (type) {
..	..	@@ -628,9 +725,10 @@
628	725	case NL80211_IFTYPE_STATION:
629	726	case NL80211_IFTYPE_AP_VLAN:
630	727	case NL80211_IFTYPE_WDS:
631		- case NL80211_IFTYPE_MONITOR:
632	728	case NL80211_IFTYPE_MESH_POINT:
633	729	return ERR_PTR(-EOPNOTSUPP);
	730	+ case NL80211_IFTYPE_MONITOR:
	731	+ return brcmf_mon_add_vif(wiphy, name);
634	732	case NL80211_IFTYPE_AP:
635	733	wdev = brcmf_ap_add_vif(wiphy, name, params);
636	734	break;
..	..	@@ -645,8 +743,8 @@
645	743	}
646	744
647	745	if (IS_ERR(wdev))
648		- brcmf_err("add iface %s type %d failed: err=%d\n",
649		- name, type, (int)PTR_ERR(wdev));
	746	+ bphy_err(drvr, "add iface %s type %d failed: err=%d\n", name,
	747	+ type, (int)PTR_ERR(wdev));
650	748	else
651	749	brcmf_cfg80211_update_proto_addr_mode(wdev);
652	750
..	..	@@ -661,12 +759,13 @@
661	759
662	760	void brcmf_set_mpc(struct brcmf_if *ifp, int mpc)
663	761	{
	762	+ struct brcmf_pub *drvr = ifp->drvr;
664	763	s32 err = 0;
665	764
666	765	if (check_vif_up(ifp->vif)) {
667	766	err = brcmf_fil_iovar_int_set(ifp, "mpc", mpc);
668	767	if (err) {
669		- brcmf_err("fail to set mpc\n");
	768	+ bphy_err(drvr, "fail to set mpc\n");
670	769	return;
671	770	}
672	771	brcmf_dbg(INFO, "MPC : %d\n", mpc);
..	..	@@ -677,6 +776,7 @@
677	776	struct brcmf_if *ifp, bool aborted,
678	777	bool fw_abort)
679	778	{
	779	+ struct brcmf_pub *drvr = cfg->pub;
680	780	struct brcmf_scan_params_le params_le;
681	781	struct cfg80211_scan_request *scan_request;
682	782	u64 reqid;
..	..	@@ -711,7 +811,7 @@
711	811	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCAN,
712	812	&params_le, sizeof(params_le));
713	813	if (err)
714		- brcmf_err("Scan abort failed\n");
	814	+ bphy_err(drvr, "Scan abort failed\n");
715	815	}
716	816
717	817	brcmf_scan_config_mpc(ifp, 1);
..	..	@@ -756,6 +856,7 @@
756	856	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
757	857	struct net_device *ndev = wdev->netdev;
758	858	struct brcmf_if *ifp = netdev_priv(ndev);
	859	+ struct brcmf_pub *drvr = cfg->pub;
759	860	int ret;
760	861	int err;
761	862
..	..	@@ -763,7 +864,7 @@
763	864
764	865	err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
765	866	if (err) {
766		- brcmf_err("interface_remove failed %d\n", err);
	867	+ bphy_err(drvr, "interface_remove failed %d\n", err);
767	868	goto err_unarm;
768	869	}
769	870
..	..	@@ -771,7 +872,7 @@
771	872	ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
772	873	BRCMF_VIF_EVENT_TIMEOUT);
773	874	if (!ret) {
774		- brcmf_err("timeout occurred\n");
	875	+ bphy_err(drvr, "timeout occurred\n");
775	876	err = -EIO;
776	877	goto err_unarm;
777	878	}
..	..	@@ -810,9 +911,10 @@
810	911	case NL80211_IFTYPE_STATION:
811	912	case NL80211_IFTYPE_AP_VLAN:
812	913	case NL80211_IFTYPE_WDS:
813		- case NL80211_IFTYPE_MONITOR:
814	914	case NL80211_IFTYPE_MESH_POINT:
815	915	return -EOPNOTSUPP;
	916	+ case NL80211_IFTYPE_MONITOR:
	917	+ return brcmf_mon_del_vif(wiphy, wdev);
816	918	case NL80211_IFTYPE_AP:
817	919	return brcmf_cfg80211_del_ap_iface(wiphy, wdev);
818	920	case NL80211_IFTYPE_P2P_CLIENT:
..	..	@@ -834,6 +936,7 @@
834	936	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
835	937	struct brcmf_if *ifp = netdev_priv(ndev);
836	938	struct brcmf_cfg80211_vif *vif = ifp->vif;
	939	+ struct brcmf_pub *drvr = cfg->pub;
837	940	s32 infra = 0;
838	941	s32 ap = 0;
839	942	s32 err = 0;
..	..	@@ -873,14 +976,14 @@
873	976	}
874	977	err = brcmf_vif_change_validate(wiphy_to_cfg(wiphy), vif, type);
875	978	if (err) {
876		- brcmf_err("iface validation failed: err=%d\n", err);
	979	+ bphy_err(drvr, "iface validation failed: err=%d\n", err);
877	980	return err;
878	981	}
879	982	switch (type) {
880	983	case NL80211_IFTYPE_MONITOR:
881	984	case NL80211_IFTYPE_WDS:
882		- brcmf_err("type (%d) : currently we do not support this type\n",
883		- type);
	985	+ bphy_err(drvr, "type (%d) : currently we do not support this type\n",
	986	+ type);
884	987	return -EOPNOTSUPP;
885	988	case NL80211_IFTYPE_ADHOC:
886	989	infra = 0;
..	..	@@ -908,7 +1011,7 @@
908	1011	} else {
909	1012	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, infra);
910	1013	if (err) {
911		- brcmf_err("WLC_SET_INFRA error (%d)\n", err);
	1014	+ bphy_err(drvr, "WLC_SET_INFRA error (%d)\n", err);
912	1015	err = -EAGAIN;
913	1016	goto done;
914	1017	}
..	..	@@ -999,6 +1102,7 @@
999	1102	brcmf_run_escan(struct brcmf_cfg80211_info cfg, struct brcmf_if ifp,
1000	1103	struct cfg80211_scan_request *request)
1001	1104	{
	1105	+ struct brcmf_pub *drvr = cfg->pub;
1002	1106	s32 params_size = BRCMF_SCAN_PARAMS_FIXED_SIZE +
1003	1107	offsetof(struct brcmf_escan_params_le, params_le);
1004	1108	struct brcmf_escan_params_le *params;
..	..	@@ -1030,7 +1134,7 @@
1030	1134	if (err == -EBUSY)
1031	1135	brcmf_dbg(INFO, "system busy : escan canceled\n");
1032	1136	else
1033		- brcmf_err("error (%d)\n", err);
	1137	+ bphy_err(drvr, "error (%d)\n", err);
1034	1138	}
1035	1139
1036	1140	kfree(params);
..	..	@@ -1067,6 +1171,7 @@
1067	1171	brcmf_cfg80211_scan(struct wiphy wiphy, struct cfg80211_scan_request request)
1068	1172	{
1069	1173	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	1174	+ struct brcmf_pub *drvr = cfg->pub;
1070	1175	struct brcmf_cfg80211_vif *vif;
1071	1176	s32 err = 0;
1072	1177
..	..	@@ -1076,21 +1181,22 @@
1076	1181	return -EIO;
1077	1182
1078	1183	if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
1079		- brcmf_err("Scanning already: status (%lu)\n", cfg->scan_status);
	1184	+ bphy_err(drvr, "Scanning already: status (%lu)\n",
	1185	+ cfg->scan_status);
1080	1186	return -EAGAIN;
1081	1187	}
1082	1188	if (test_bit(BRCMF_SCAN_STATUS_ABORT, &cfg->scan_status)) {
1083		- brcmf_err("Scanning being aborted: status (%lu)\n",
1084		- cfg->scan_status);
	1189	+ bphy_err(drvr, "Scanning being aborted: status (%lu)\n",
	1190	+ cfg->scan_status);
1085	1191	return -EAGAIN;
1086	1192	}
1087	1193	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
1088		- brcmf_err("Scanning suppressed: status (%lu)\n",
1089		- cfg->scan_status);
	1194	+ bphy_err(drvr, "Scanning suppressed: status (%lu)\n",
	1195	+ cfg->scan_status);
1090	1196	return -EAGAIN;
1091	1197	}
1092	1198	if (test_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state)) {
1093		- brcmf_err("Connecting: status (%lu)\n", vif->sme_state);
	1199	+ bphy_err(drvr, "Connecting: status (%lu)\n", vif->sme_state);
1094	1200	return -EAGAIN;
1095	1201	}
1096	1202
..	..	@@ -1124,7 +1230,7 @@
1124	1230	return 0;
1125	1231
1126	1232	scan_out:
1127		- brcmf_err("scan error (%d)\n", err);
	1233	+ bphy_err(drvr, "scan error (%d)\n", err);
1128	1234	clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
1129	1235	cfg->scan_request = NULL;
1130	1236	return err;
..	..	@@ -1132,36 +1238,41 @@
1132	1238
1133	1239	static s32 brcmf_set_rts(struct net_device *ndev, u32 rts_threshold)
1134	1240	{
	1241	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1242	+ struct brcmf_pub *drvr = ifp->drvr;
1135	1243	s32 err = 0;
1136	1244
1137		- err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "rtsthresh",
1138		- rts_threshold);
	1245	+ err = brcmf_fil_iovar_int_set(ifp, "rtsthresh", rts_threshold);
1139	1246	if (err)
1140		- brcmf_err("Error (%d)\n", err);
	1247	+ bphy_err(drvr, "Error (%d)\n", err);
1141	1248
1142	1249	return err;
1143	1250	}
1144	1251
1145	1252	static s32 brcmf_set_frag(struct net_device *ndev, u32 frag_threshold)
1146	1253	{
	1254	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1255	+ struct brcmf_pub *drvr = ifp->drvr;
1147	1256	s32 err = 0;
1148	1257
1149		- err = brcmf_fil_iovar_int_set(netdev_priv(ndev), "fragthresh",
	1258	+ err = brcmf_fil_iovar_int_set(ifp, "fragthresh",
1150	1259	frag_threshold);
1151	1260	if (err)
1152		- brcmf_err("Error (%d)\n", err);
	1261	+ bphy_err(drvr, "Error (%d)\n", err);
1153	1262
1154	1263	return err;
1155	1264	}
1156	1265
1157	1266	static s32 brcmf_set_retry(struct net_device *ndev, u32 retry, bool l)
1158	1267	{
	1268	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1269	+ struct brcmf_pub *drvr = ifp->drvr;
1159	1270	s32 err = 0;
1160	1271	u32 cmd = (l ? BRCMF_C_SET_LRL : BRCMF_C_SET_SRL);
1161	1272
1162		- err = brcmf_fil_cmd_int_set(netdev_priv(ndev), cmd, retry);
	1273	+ err = brcmf_fil_cmd_int_set(ifp, cmd, retry);
1163	1274	if (err) {
1164		- brcmf_err("cmd (%d) , error (%d)\n", cmd, err);
	1275	+ bphy_err(drvr, "cmd (%d) , error (%d)\n", cmd, err);
1165	1276	return err;
1166	1277	}
1167	1278	return err;
..	..	@@ -1237,49 +1348,83 @@
1237	1348
1238	1349	static int brcmf_set_pmk(struct brcmf_if ifp, const u8 pmk_data, u16 pmk_len)
1239	1350	{
	1351	+ struct brcmf_pub *drvr = ifp->drvr;
1240	1352	struct brcmf_wsec_pmk_le pmk;
1241		- int i, err;
	1353	+ int err;
1242	1354
1243		- /* convert to firmware key format */
1244		- pmk.key_len = cpu_to_le16(pmk_len << 1);
1245		- pmk.flags = cpu_to_le16(BRCMF_WSEC_PASSPHRASE);
1246		- for (i = 0; i < pmk_len; i++)
1247		- snprintf(&pmk.key[2 * i], 3, "%02x", pmk_data[i]);
	1355	+ memset(&pmk, 0, sizeof(pmk));
	1356	+
	1357	+ /* pass pmk directly */
	1358	+ pmk.key_len = cpu_to_le16(pmk_len);
	1359	+ pmk.flags = cpu_to_le16(0);
	1360	+ memcpy(pmk.key, pmk_data, pmk_len);
1248	1361
1249	1362	/* store psk in firmware */
1250	1363	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK,
1251	1364	&pmk, sizeof(pmk));
1252	1365	if (err < 0)
1253		- brcmf_err("failed to change PSK in firmware (len=%u)\n",
1254		- pmk_len);
	1366	+ bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n",
	1367	+ pmk_len);
1255	1368
1256	1369	return err;
1257	1370	}
1258	1371
1259		-static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason)
	1372	+static int brcmf_set_sae_password(struct brcmf_if ifp, const u8 pwd_data,
	1373	+ u16 pwd_len)
	1374	+{
	1375	+ struct brcmf_pub *drvr = ifp->drvr;
	1376	+ struct brcmf_wsec_sae_pwd_le sae_pwd;
	1377	+ int err;
	1378	+
	1379	+ if (pwd_len > BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) {
	1380	+ bphy_err(drvr, "sae_password must be less than %d\n",
	1381	+ BRCMF_WSEC_MAX_SAE_PASSWORD_LEN);
	1382	+ return -EINVAL;
	1383	+ }
	1384	+
	1385	+ sae_pwd.key_len = cpu_to_le16(pwd_len);
	1386	+ memcpy(sae_pwd.key, pwd_data, pwd_len);
	1387	+
	1388	+ err = brcmf_fil_iovar_data_set(ifp, "sae_password", &sae_pwd,
	1389	+ sizeof(sae_pwd));
	1390	+ if (err < 0)
	1391	+ bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n",
	1392	+ pwd_len);
	1393	+
	1394	+ return err;
	1395	+}
	1396	+
	1397	+static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason,
	1398	+ bool locally_generated)
1260	1399	{
1261	1400	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(vif->wdev.wiphy);
	1401	+ struct brcmf_pub *drvr = cfg->pub;
	1402	+ bool bus_up = drvr->bus_if->state == BRCMF_BUS_UP;
1262	1403	s32 err = 0;
1263	1404
1264	1405	brcmf_dbg(TRACE, "Enter\n");
1265	1406
1266	1407	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);
	1408	+ if (bus_up) {
	1409	+ brcmf_dbg(INFO, "Call WLC_DISASSOC to stop excess roaming\n");
	1410	+ err = brcmf_fil_cmd_data_set(vif->ifp,
	1411	+ BRCMF_C_DISASSOC, NULL, 0);
	1412	+ if (err)
	1413	+ bphy_err(drvr, "WLC_DISASSOC failed (%d)\n",
	1414	+ err);
1272	1415	}
	1416	+
1273	1417	if ((vif->wdev.iftype == NL80211_IFTYPE_STATION) \|\|
1274	1418	(vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT))
1275	1419	cfg80211_disconnected(vif->wdev.netdev, reason, NULL, 0,
1276		- true, GFP_KERNEL);
	1420	+ locally_generated, GFP_KERNEL);
1277	1421	}
1278	1422	clear_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state);
1279	1423	clear_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status);
1280	1424	brcmf_btcoex_set_mode(vif, BRCMF_BTCOEX_ENABLED, 0);
1281	1425	if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_NONE) {
1282		- brcmf_set_pmk(vif->ifp, NULL, 0);
	1426	+ if (bus_up)
	1427	+ brcmf_set_pmk(vif->ifp, NULL, 0);
1283	1428	vif->profile.use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
1284	1429	}
1285	1430	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -1292,6 +1437,7 @@
1292	1437	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
1293	1438	struct brcmf_if *ifp = netdev_priv(ndev);
1294	1439	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	1440	+ struct brcmf_pub *drvr = cfg->pub;
1295	1441	struct brcmf_join_params join_params;
1296	1442	size_t join_params_size = 0;
1297	1443	s32 err = 0;
..	..	@@ -1356,7 +1502,7 @@
1356	1502
1357	1503	err = brcmf_fil_iovar_int_set(ifp, "wsec", wsec);
1358	1504	if (err) {
1359		- brcmf_err("wsec failed (%d)\n", err);
	1505	+ bphy_err(drvr, "wsec failed (%d)\n", err);
1360	1506	goto done;
1361	1507	}
1362	1508
..	..	@@ -1368,7 +1514,7 @@
1368	1514
1369	1515	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD, bcnprd);
1370	1516	if (err) {
1371		- brcmf_err("WLC_SET_BCNPRD failed (%d)\n", err);
	1517	+ bphy_err(drvr, "WLC_SET_BCNPRD failed (%d)\n", err);
1372	1518	goto done;
1373	1519	}
1374	1520
..	..	@@ -1413,7 +1559,7 @@
1413	1559	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_CHANNEL,
1414	1560	target_channel);
1415	1561	if (err) {
1416		- brcmf_err("WLC_SET_CHANNEL failed (%d)\n", err);
	1562	+ bphy_err(drvr, "WLC_SET_CHANNEL failed (%d)\n", err);
1417	1563	goto done;
1418	1564	}
1419	1565	} else
..	..	@@ -1425,7 +1571,7 @@
1425	1571	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
1426	1572	&join_params, join_params_size);
1427	1573	if (err) {
1428		- brcmf_err("WLC_SET_SSID failed (%d)\n", err);
	1574	+ bphy_err(drvr, "WLC_SET_SSID failed (%d)\n", err);
1429	1575	goto done;
1430	1576	}
1431	1577
..	..	@@ -1450,7 +1596,7 @@
1450	1596	return 0;
1451	1597	}
1452	1598
1453		- brcmf_link_down(ifp->vif, WLAN_REASON_DEAUTH_LEAVING);
	1599	+ brcmf_link_down(ifp->vif, WLAN_REASON_DEAUTH_LEAVING, true);
1454	1600	brcmf_net_setcarrier(ifp, false);
1455	1601
1456	1602	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -1461,7 +1607,9 @@
1461	1607	static s32 brcmf_set_wpa_version(struct net_device *ndev,
1462	1608	struct cfg80211_connect_params *sme)
1463	1609	{
	1610	+ struct brcmf_if *ifp = netdev_priv(ndev);
1464	1611	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1612	+ struct brcmf_pub *drvr = ifp->drvr;
1465	1613	struct brcmf_cfg80211_security *sec;
1466	1614	s32 val = 0;
1467	1615	s32 err = 0;
..	..	@@ -1470,12 +1618,14 @@
1470	1618	val = WPA_AUTH_PSK \| WPA_AUTH_UNSPECIFIED;
1471	1619	else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)
1472	1620	val = WPA2_AUTH_PSK \| WPA2_AUTH_UNSPECIFIED;
	1621	+ else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_3)
	1622	+ val = WPA3_AUTH_SAE_PSK;
1473	1623	else
1474	1624	val = WPA_AUTH_DISABLED;
1475	1625	brcmf_dbg(CONN, "setting wpa_auth to 0x%0x\n", val);
1476		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
	1626	+ err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", val);
1477	1627	if (err) {
1478		- brcmf_err("set wpa_auth failed (%d)\n", err);
	1628	+ bphy_err(drvr, "set wpa_auth failed (%d)\n", err);
1479	1629	return err;
1480	1630	}
1481	1631	sec = &profile->sec;
..	..	@@ -1486,7 +1636,9 @@
1486	1636	static s32 brcmf_set_auth_type(struct net_device *ndev,
1487	1637	struct cfg80211_connect_params *sme)
1488	1638	{
	1639	+ struct brcmf_if *ifp = netdev_priv(ndev);
1489	1640	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1641	+ struct brcmf_pub *drvr = ifp->drvr;
1490	1642	struct brcmf_cfg80211_security *sec;
1491	1643	s32 val = 0;
1492	1644	s32 err = 0;
..	..	@@ -1500,15 +1652,19 @@
1500	1652	val = 1;
1501	1653	brcmf_dbg(CONN, "shared key\n");
1502	1654	break;
	1655	+ case NL80211_AUTHTYPE_SAE:
	1656	+ val = 3;
	1657	+ brcmf_dbg(CONN, "SAE authentication\n");
	1658	+ break;
1503	1659	default:
1504	1660	val = 2;
1505	1661	brcmf_dbg(CONN, "automatic, auth type (%d)\n", sme->auth_type);
1506	1662	break;
1507	1663	}
1508	1664
1509		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
	1665	+ err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
1510	1666	if (err) {
1511		- brcmf_err("set auth failed (%d)\n", err);
	1667	+ bphy_err(drvr, "set auth failed (%d)\n", err);
1512	1668	return err;
1513	1669	}
1514	1670	sec = &profile->sec;
..	..	@@ -1520,7 +1676,9 @@
1520	1676	brcmf_set_wsec_mode(struct net_device *ndev,
1521	1677	struct cfg80211_connect_params *sme)
1522	1678	{
	1679	+ struct brcmf_if *ifp = netdev_priv(ndev);
1523	1680	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
	1681	+ struct brcmf_pub *drvr = ifp->drvr;
1524	1682	struct brcmf_cfg80211_security *sec;
1525	1683	s32 pval = 0;
1526	1684	s32 gval = 0;
..	..	@@ -1543,8 +1701,8 @@
1543	1701	pval = AES_ENABLED;
1544	1702	break;
1545	1703	default:
1546		- brcmf_err("invalid cipher pairwise (%d)\n",
1547		- sme->crypto.ciphers_pairwise[0]);
	1704	+ bphy_err(drvr, "invalid cipher pairwise (%d)\n",
	1705	+ sme->crypto.ciphers_pairwise[0]);
1548	1706	return -EINVAL;
1549	1707	}
1550	1708	}
..	..	@@ -1564,8 +1722,8 @@
1564	1722	gval = AES_ENABLED;
1565	1723	break;
1566	1724	default:
1567		- brcmf_err("invalid cipher group (%d)\n",
1568		- sme->crypto.cipher_group);
	1725	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1726	+ sme->crypto.cipher_group);
1569	1727	return -EINVAL;
1570	1728	}
1571	1729	}
..	..	@@ -1578,9 +1736,9 @@
1578	1736	pval = AES_ENABLED;
1579	1737
1580	1738	wsec = pval \| gval;
1581		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", wsec);
	1739	+ err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
1582	1740	if (err) {
1583		- brcmf_err("error (%d)\n", err);
	1741	+ bphy_err(drvr, "error (%d)\n", err);
1584	1742	return err;
1585	1743	}
1586	1744
..	..	@@ -1596,6 +1754,7 @@
1596	1754	{
1597	1755	struct brcmf_if *ifp = netdev_priv(ndev);
1598	1756	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	1757	+ struct brcmf_pub *drvr = ifp->drvr;
1599	1758	s32 val;
1600	1759	s32 err;
1601	1760	const struct brcmf_tlv *rsn_ie;
..	..	@@ -1607,13 +1766,14 @@
1607	1766	u16 count;
1608	1767
1609	1768	profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
	1769	+ profile->is_ft = false;
1610	1770
1611	1771	if (!sme->crypto.n_akm_suites)
1612	1772	return 0;
1613	1773
1614	1774	err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &val);
1615	1775	if (err) {
1616		- brcmf_err("could not get wpa_auth (%d)\n", err);
	1776	+ bphy_err(drvr, "could not get wpa_auth (%d)\n", err);
1617	1777	return err;
1618	1778	}
1619	1779	if (val & (WPA_AUTH_PSK \| WPA_AUTH_UNSPECIFIED)) {
..	..	@@ -1627,8 +1787,8 @@
1627	1787	val = WPA_AUTH_PSK;
1628	1788	break;
1629	1789	default:
1630		- brcmf_err("invalid cipher group (%d)\n",
1631		- sme->crypto.cipher_group);
	1790	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1791	+ sme->crypto.cipher_group);
1632	1792	return -EINVAL;
1633	1793	}
1634	1794	} else if (val & (WPA2_AUTH_PSK \| WPA2_AUTH_UNSPECIFIED)) {
..	..	@@ -1649,9 +1809,33 @@
1649	1809	case WLAN_AKM_SUITE_PSK:
1650	1810	val = WPA2_AUTH_PSK;
1651	1811	break;
	1812	+ case WLAN_AKM_SUITE_FT_8021X:
	1813	+ val = WPA2_AUTH_UNSPECIFIED \| WPA2_AUTH_FT;
	1814	+ profile->is_ft = true;
	1815	+ if (sme->want_1x)
	1816	+ profile->use_fwsup = BRCMF_PROFILE_FWSUP_1X;
	1817	+ break;
	1818	+ case WLAN_AKM_SUITE_FT_PSK:
	1819	+ val = WPA2_AUTH_PSK \| WPA2_AUTH_FT;
	1820	+ profile->is_ft = true;
	1821	+ break;
1652	1822	default:
1653		- brcmf_err("invalid cipher group (%d)\n",
1654		- sme->crypto.cipher_group);
	1823	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1824	+ sme->crypto.cipher_group);
	1825	+ return -EINVAL;
	1826	+ }
	1827	+ } else if (val & WPA3_AUTH_SAE_PSK) {
	1828	+ switch (sme->crypto.akm_suites[0]) {
	1829	+ case WLAN_AKM_SUITE_SAE:
	1830	+ val = WPA3_AUTH_SAE_PSK;
	1831	+ if (sme->crypto.sae_pwd) {
	1832	+ brcmf_dbg(INFO, "using SAE offload\n");
	1833	+ profile->use_fwsup = BRCMF_PROFILE_FWSUP_SAE;
	1834	+ }
	1835	+ break;
	1836	+ default:
	1837	+ bphy_err(drvr, "invalid cipher group (%d)\n",
	1838	+ sme->crypto.cipher_group);
1655	1839	return -EINVAL;
1656	1840	}
1657	1841	}
..	..	@@ -1697,7 +1881,7 @@
1697	1881	brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
1698	1882	err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
1699	1883	if (err) {
1700		- brcmf_err("could not set wpa_auth (%d)\n", err);
	1884	+ bphy_err(drvr, "could not set wpa_auth (%d)\n", err);
1701	1885	return err;
1702	1886	}
1703	1887
..	..	@@ -1708,6 +1892,8 @@
1708	1892	brcmf_set_sharedkey(struct net_device *ndev,
1709	1893	struct cfg80211_connect_params *sme)
1710	1894	{
	1895	+ struct brcmf_if *ifp = netdev_priv(ndev);
	1896	+ struct brcmf_pub *drvr = ifp->drvr;
1711	1897	struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
1712	1898	struct brcmf_cfg80211_security *sec;
1713	1899	struct brcmf_wsec_key key;
..	..	@@ -1723,7 +1909,8 @@
1723	1909	brcmf_dbg(CONN, "wpa_versions 0x%x cipher_pairwise 0x%x\n",
1724	1910	sec->wpa_versions, sec->cipher_pairwise);
1725	1911
1726		- if (sec->wpa_versions & (NL80211_WPA_VERSION_1 \| NL80211_WPA_VERSION_2))
	1912	+ if (sec->wpa_versions & (NL80211_WPA_VERSION_1 \| NL80211_WPA_VERSION_2 \|
	1913	+ NL80211_WPA_VERSION_3))
1727	1914	return 0;
1728	1915
1729	1916	if (!(sec->cipher_pairwise &
..	..	@@ -1734,7 +1921,7 @@
1734	1921	key.len = (u32) sme->key_len;
1735	1922	key.index = (u32) sme->key_idx;
1736	1923	if (key.len > sizeof(key.data)) {
1737		- brcmf_err("Too long key length (%u)\n", key.len);
	1924	+ bphy_err(drvr, "Too long key length (%u)\n", key.len);
1738	1925	return -EINVAL;
1739	1926	}
1740	1927	memcpy(key.data, sme->key, key.len);
..	..	@@ -1747,24 +1934,24 @@
1747	1934	key.algo = CRYPTO_ALGO_WEP128;
1748	1935	break;
1749	1936	default:
1750		- brcmf_err("Invalid algorithm (%d)\n",
1751		- sme->crypto.ciphers_pairwise[0]);
	1937	+ bphy_err(drvr, "Invalid algorithm (%d)\n",
	1938	+ sme->crypto.ciphers_pairwise[0]);
1752	1939	return -EINVAL;
1753	1940	}
1754	1941	/* Set the new key/index */
1755	1942	brcmf_dbg(CONN, "key length (%d) key index (%d) algo (%d)\n",
1756	1943	key.len, key.index, key.algo);
1757	1944	brcmf_dbg(CONN, "key \"%s\"\n", key.data);
1758		- err = send_key_to_dongle(netdev_priv(ndev), &key);
	1945	+ err = send_key_to_dongle(ifp, &key);
1759	1946	if (err)
1760	1947	return err;
1761	1948
1762	1949	if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {
1763	1950	brcmf_dbg(CONN, "set auth_type to shared key\n");
1764	1951	val = WL_AUTH_SHARED_KEY; /* shared key */
1765		- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "auth", val);
	1952	+ err = brcmf_fil_bsscfg_int_set(ifp, "auth", val);
1766	1953	if (err)
1767		- brcmf_err("set auth failed (%d)\n", err);
	1954	+ bphy_err(drvr, "set auth failed (%d)\n", err);
1768	1955	}
1769	1956	return err;
1770	1957	}
..	..	@@ -1784,6 +1971,7 @@
1784	1971	static void brcmf_set_join_pref(struct brcmf_if *ifp,
1785	1972	struct cfg80211_bss_selection *bss_select)
1786	1973	{
	1974	+ struct brcmf_pub *drvr = ifp->drvr;
1787	1975	struct brcmf_join_pref_params join_pref_params[2];
1788	1976	enum nl80211_band band;
1789	1977	int err, i = 0;
..	..	@@ -1822,7 +2010,7 @@
1822	2010	err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
1823	2011	sizeof(join_pref_params));
1824	2012	if (err)
1825		- brcmf_err("Set join_pref error (%d)\n", err);
	2013	+ bphy_err(drvr, "Set join_pref error (%d)\n", err);
1826	2014	}
1827	2015
1828	2016	static s32
..	..	@@ -1833,6 +2021,7 @@
1833	2021	struct brcmf_if *ifp = netdev_priv(ndev);
1834	2022	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
1835	2023	struct ieee80211_channel *chan = sme->channel;
	2024	+ struct brcmf_pub *drvr = ifp->drvr;
1836	2025	struct brcmf_join_params join_params;
1837	2026	size_t join_params_size;
1838	2027	const struct brcmf_tlv *rsn_ie;
..	..	@@ -1849,7 +2038,7 @@
1849	2038	return -EIO;
1850	2039
1851	2040	if (!sme->ssid) {
1852		- brcmf_err("Invalid ssid\n");
	2041	+ bphy_err(drvr, "Invalid ssid\n");
1853	2042	return -EOPNOTSUPP;
1854	2043	}
1855	2044
..	..	@@ -1878,7 +2067,7 @@
1878	2067	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
1879	2068	sme->ie, sme->ie_len);
1880	2069	if (err)
1881		- brcmf_err("Set Assoc REQ IE Failed\n");
	2070	+ bphy_err(drvr, "Set Assoc REQ IE Failed\n");
1882	2071	else
1883	2072	brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
1884	2073
..	..	@@ -1899,36 +2088,37 @@
1899	2088
1900	2089	err = brcmf_set_wpa_version(ndev, sme);
1901	2090	if (err) {
1902		- brcmf_err("wl_set_wpa_version failed (%d)\n", err);
	2091	+ bphy_err(drvr, "wl_set_wpa_version failed (%d)\n", err);
1903	2092	goto done;
1904	2093	}
1905	2094
1906	2095	sme->auth_type = brcmf_war_auth_type(ifp, sme->auth_type);
1907	2096	err = brcmf_set_auth_type(ndev, sme);
1908	2097	if (err) {
1909		- brcmf_err("wl_set_auth_type failed (%d)\n", err);
	2098	+ bphy_err(drvr, "wl_set_auth_type failed (%d)\n", err);
1910	2099	goto done;
1911	2100	}
1912	2101
1913	2102	err = brcmf_set_wsec_mode(ndev, sme);
1914	2103	if (err) {
1915		- brcmf_err("wl_set_set_cipher failed (%d)\n", err);
	2104	+ bphy_err(drvr, "wl_set_set_cipher failed (%d)\n", err);
1916	2105	goto done;
1917	2106	}
1918	2107
1919	2108	err = brcmf_set_key_mgmt(ndev, sme);
1920	2109	if (err) {
1921		- brcmf_err("wl_set_key_mgmt failed (%d)\n", err);
	2110	+ bphy_err(drvr, "wl_set_key_mgmt failed (%d)\n", err);
1922	2111	goto done;
1923	2112	}
1924	2113
1925	2114	err = brcmf_set_sharedkey(ndev, sme);
1926	2115	if (err) {
1927		- brcmf_err("brcmf_set_sharedkey failed (%d)\n", err);
	2116	+ bphy_err(drvr, "brcmf_set_sharedkey failed (%d)\n", err);
1928	2117	goto done;
1929	2118	}
1930	2119
1931		- if (sme->crypto.psk) {
	2120	+ if (sme->crypto.psk &&
	2121	+ profile->use_fwsup != BRCMF_PROFILE_FWSUP_SAE) {
1932	2122	if (WARN_ON(profile->use_fwsup != BRCMF_PROFILE_FWSUP_NONE)) {
1933	2123	err = -EINVAL;
1934	2124	goto done;
..	..	@@ -1941,17 +2131,29 @@
1941	2131	/* enable firmware supplicant for this interface */
1942	2132	err = brcmf_fil_iovar_int_set(ifp, "sup_wpa", 1);
1943	2133	if (err < 0) {
1944		- brcmf_err("failed to enable fw supplicant\n");
	2134	+ bphy_err(drvr, "failed to enable fw supplicant\n");
1945	2135	goto done;
1946	2136	}
1947	2137	}
1948	2138
1949		- if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_PSK) {
	2139	+ if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_PSK)
1950	2140	err = brcmf_set_pmk(ifp, sme->crypto.psk,
1951	2141	BRCMF_WSEC_MAX_PSK_LEN);
1952		- if (err)
	2142	+ else if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_SAE) {
	2143	+ /* clean up user-space RSNE */
	2144	+ err = brcmf_fil_iovar_data_set(ifp, "wpaie", NULL, 0);
	2145	+ if (err) {
	2146	+ bphy_err(drvr, "failed to clean up user-space RSNE\n");
1953	2147	goto done;
	2148	+ }
	2149	+ err = brcmf_set_sae_password(ifp, sme->crypto.sae_pwd,
	2150	+ sme->crypto.sae_pwd_len);
	2151	+ if (!err && sme->crypto.psk)
	2152	+ err = brcmf_set_pmk(ifp, sme->crypto.psk,
	2153	+ BRCMF_WSEC_MAX_PSK_LEN);
1954	2154	}
	2155	+ if (err)
	2156	+ goto done;
1955	2157
1956	2158	/* Join with specific BSSID and cached SSID
1957	2159	* If SSID is zero join based on BSSID only
..	..	@@ -2036,7 +2238,7 @@
2036	2238	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
2037	2239	&join_params, join_params_size);
2038	2240	if (err)
2039		- brcmf_err("BRCMF_C_SET_SSID failed (%d)\n", err);
	2241	+ bphy_err(drvr, "BRCMF_C_SET_SSID failed (%d)\n", err);
2040	2242
2041	2243	done:
2042	2244	if (err)
..	..	@@ -2049,8 +2251,10 @@
2049	2251	brcmf_cfg80211_disconnect(struct wiphy wiphy, struct net_device ndev,
2050	2252	u16 reason_code)
2051	2253	{
	2254	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2052	2255	struct brcmf_if *ifp = netdev_priv(ndev);
2053	2256	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	2257	+ struct brcmf_pub *drvr = cfg->pub;
2054	2258	struct brcmf_scb_val_le scbval;
2055	2259	s32 err = 0;
2056	2260
..	..	@@ -2067,7 +2271,7 @@
2067	2271	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_DISASSOC,
2068	2272	&scbval, sizeof(scbval));
2069	2273	if (err)
2070		- brcmf_err("error (%d)\n", err);
	2274	+ bphy_err(drvr, "error (%d)\n", err);
2071	2275
2072	2276	brcmf_dbg(TRACE, "Exit\n");
2073	2277	return err;
..	..	@@ -2080,6 +2284,7 @@
2080	2284	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2081	2285	struct net_device *ndev = cfg_to_ndev(cfg);
2082	2286	struct brcmf_if *ifp = netdev_priv(ndev);
	2287	+ struct brcmf_pub *drvr = cfg->pub;
2083	2288	s32 err;
2084	2289	s32 disable;
2085	2290	u32 qdbm = 127;
..	..	@@ -2094,7 +2299,7 @@
2094	2299	case NL80211_TX_POWER_LIMITED:
2095	2300	case NL80211_TX_POWER_FIXED:
2096	2301	if (mbm < 0) {
2097		- brcmf_err("TX_POWER_FIXED - dbm is negative\n");
	2302	+ bphy_err(drvr, "TX_POWER_FIXED - dbm is negative\n");
2098	2303	err = -EINVAL;
2099	2304	goto done;
2100	2305	}
..	..	@@ -2104,7 +2309,7 @@
2104	2309	qdbm \|= WL_TXPWR_OVERRIDE;
2105	2310	break;
2106	2311	default:
2107		- brcmf_err("Unsupported type %d\n", type);
	2312	+ bphy_err(drvr, "Unsupported type %d\n", type);
2108	2313	err = -EINVAL;
2109	2314	goto done;
2110	2315	}
..	..	@@ -2112,11 +2317,11 @@
2112	2317	disable = WL_RADIO_SW_DISABLE << 16;
2113	2318	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_RADIO, disable);
2114	2319	if (err)
2115		- brcmf_err("WLC_SET_RADIO error (%d)\n", err);
	2320	+ bphy_err(drvr, "WLC_SET_RADIO error (%d)\n", err);
2116	2321
2117	2322	err = brcmf_fil_iovar_int_set(ifp, "qtxpower", qdbm);
2118	2323	if (err)
2119		- brcmf_err("qtxpower error (%d)\n", err);
	2324	+ bphy_err(drvr, "qtxpower error (%d)\n", err);
2120	2325
2121	2326	done:
2122	2327	brcmf_dbg(TRACE, "Exit %d (qdbm)\n", qdbm & ~WL_TXPWR_OVERRIDE);
..	..	@@ -2127,7 +2332,9 @@
2127	2332	brcmf_cfg80211_get_tx_power(struct wiphy wiphy, struct wireless_dev wdev,
2128	2333	s32 *dbm)
2129	2334	{
	2335	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2130	2336	struct brcmf_cfg80211_vif *vif = wdev_to_vif(wdev);
	2337	+ struct brcmf_pub *drvr = cfg->pub;
2131	2338	s32 qdbm = 0;
2132	2339	s32 err;
2133	2340
..	..	@@ -2137,7 +2344,7 @@
2137	2344
2138	2345	err = brcmf_fil_iovar_int_get(vif->ifp, "qtxpower", &qdbm);
2139	2346	if (err) {
2140		- brcmf_err("error (%d)\n", err);
	2347	+ bphy_err(drvr, "error (%d)\n", err);
2141	2348	goto done;
2142	2349	}
2143	2350	*dbm = (qdbm & ~WL_TXPWR_OVERRIDE) / 4;
..	..	@@ -2152,6 +2359,7 @@
2152	2359	u8 key_idx, bool unicast, bool multicast)
2153	2360	{
2154	2361	struct brcmf_if *ifp = netdev_priv(ndev);
	2362	+ struct brcmf_pub *drvr = ifp->drvr;
2155	2363	u32 index;
2156	2364	u32 wsec;
2157	2365	s32 err = 0;
..	..	@@ -2163,7 +2371,7 @@
2163	2371
2164	2372	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2165	2373	if (err) {
2166		- brcmf_err("WLC_GET_WSEC error (%d)\n", err);
	2374	+ bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
2167	2375	goto done;
2168	2376	}
2169	2377
..	..	@@ -2173,7 +2381,7 @@
2173	2381	err = brcmf_fil_cmd_int_set(ifp,
2174	2382	BRCMF_C_SET_KEY_PRIMARY, index);
2175	2383	if (err)
2176		- brcmf_err("error (%d)\n", err);
	2384	+ bphy_err(drvr, "error (%d)\n", err);
2177	2385	}
2178	2386	done:
2179	2387	brcmf_dbg(TRACE, "Exit\n");
..	..	@@ -2222,7 +2430,9 @@
2222	2430	u8 key_idx, bool pairwise, const u8 *mac_addr,
2223	2431	struct key_params *params)
2224	2432	{
	2433	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2225	2434	struct brcmf_if *ifp = netdev_priv(ndev);
	2435	+ struct brcmf_pub *drvr = cfg->pub;
2226	2436	struct brcmf_wsec_key *key;
2227	2437	s32 val;
2228	2438	s32 wsec;
..	..	@@ -2237,7 +2447,7 @@
2237	2447
2238	2448	if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
2239	2449	/* we ignore this key index in this case */
2240		- brcmf_err("invalid key index (%d)\n", key_idx);
	2450	+ bphy_err(drvr, "invalid key index (%d)\n", key_idx);
2241	2451	return -EINVAL;
2242	2452	}
2243	2453
..	..	@@ -2246,7 +2456,7 @@
2246	2456	mac_addr);
2247	2457
2248	2458	if (params->key_len > sizeof(key->data)) {
2249		- brcmf_err("Too long key length (%u)\n", params->key_len);
	2459	+ bphy_err(drvr, "Too long key length (%u)\n", params->key_len);
2250	2460	return -EINVAL;
2251	2461	}
2252	2462
..	..	@@ -2266,6 +2476,17 @@
2266	2476	memcpy(key->data, params->key, key->len);
2267	2477	if (!ext_key)
2268	2478	key->flags = BRCMF_PRIMARY_KEY;
	2479	+
	2480	+ if (params->seq && params->seq_len == 6) {
	2481	+ /* rx iv */
	2482	+ u8 *ivptr;
	2483	+
	2484	+ ivptr = (u8 *)params->seq;
	2485	+ key->rxiv.hi = (ivptr[5] << 24) \| (ivptr[4] << 16) \|
	2486	+ (ivptr[3] << 8) \| ivptr[2];
	2487	+ key->rxiv.lo = (ivptr[1] << 8) \| ivptr[0];
	2488	+ key->iv_initialized = true;
	2489	+ }
2269	2490
2270	2491	switch (params->cipher) {
2271	2492	case WLAN_CIPHER_SUITE_WEP40:
..	..	@@ -2300,7 +2521,7 @@
2300	2521	brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_CCMP\n");
2301	2522	break;
2302	2523	default:
2303		- brcmf_err("Invalid cipher (0x%x)\n", params->cipher);
	2524	+ bphy_err(drvr, "Invalid cipher (0x%x)\n", params->cipher);
2304	2525	err = -EINVAL;
2305	2526	goto done;
2306	2527	}
..	..	@@ -2311,13 +2532,13 @@
2311	2532
2312	2533	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2313	2534	if (err) {
2314		- brcmf_err("get wsec error (%d)\n", err);
	2535	+ bphy_err(drvr, "get wsec error (%d)\n", err);
2315	2536	goto done;
2316	2537	}
2317	2538	wsec \|= val;
2318	2539	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
2319	2540	if (err) {
2320		- brcmf_err("set wsec error (%d)\n", err);
	2541	+ bphy_err(drvr, "set wsec error (%d)\n", err);
2321	2542	goto done;
2322	2543	}
2323	2544
..	..	@@ -2332,9 +2553,11 @@
2332	2553	void (callback)(void cookie,
2333	2554	struct key_params *params))
2334	2555	{
	2556	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2335	2557	struct key_params params;
2336	2558	struct brcmf_if *ifp = netdev_priv(ndev);
2337	2559	struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	2560	+ struct brcmf_pub *drvr = cfg->pub;
2338	2561	struct brcmf_cfg80211_security *sec;
2339	2562	s32 wsec;
2340	2563	s32 err = 0;
..	..	@@ -2348,7 +2571,7 @@
2348	2571
2349	2572	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2350	2573	if (err) {
2351		- brcmf_err("WLC_GET_WSEC error (%d)\n", err);
	2574	+ bphy_err(drvr, "WLC_GET_WSEC error (%d)\n", err);
2352	2575	/* Ignore this error, may happen during DISASSOC */
2353	2576	err = -EAGAIN;
2354	2577	goto done;
..	..	@@ -2369,7 +2592,7 @@
2369	2592	params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
2370	2593	brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
2371	2594	} else {
2372		- brcmf_err("Invalid algo (0x%x)\n", wsec);
	2595	+ bphy_err(drvr, "Invalid algo (0x%x)\n", wsec);
2373	2596	err = -EINVAL;
2374	2597	goto done;
2375	2598	}
..	..	@@ -2399,6 +2622,7 @@
2399	2622	static void
2400	2623	brcmf_cfg80211_reconfigure_wep(struct brcmf_if *ifp)
2401	2624	{
	2625	+ struct brcmf_pub *drvr = ifp->drvr;
2402	2626	s32 err;
2403	2627	u8 key_idx;
2404	2628	struct brcmf_wsec_key *key;
..	..	@@ -2415,18 +2639,18 @@
2415	2639
2416	2640	err = send_key_to_dongle(ifp, key);
2417	2641	if (err) {
2418		- brcmf_err("Setting WEP key failed (%d)\n", err);
	2642	+ bphy_err(drvr, "Setting WEP key failed (%d)\n", err);
2419	2643	return;
2420	2644	}
2421	2645	err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
2422	2646	if (err) {
2423		- brcmf_err("get wsec error (%d)\n", err);
	2647	+ bphy_err(drvr, "get wsec error (%d)\n", err);
2424	2648	return;
2425	2649	}
2426	2650	wsec \|= WEP_ENABLED;
2427	2651	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
2428	2652	if (err)
2429		- brcmf_err("set wsec error (%d)\n", err);
	2653	+ bphy_err(drvr, "set wsec error (%d)\n", err);
2430	2654	}
2431	2655
2432	2656	static void brcmf_convert_sta_flags(u32 fw_sta_flags, struct station_info *si)
..	..	@@ -2452,6 +2676,7 @@
2452	2676
2453	2677	static void brcmf_fill_bss_param(struct brcmf_if ifp, struct station_info si)
2454	2678	{
	2679	+ struct brcmf_pub *drvr = ifp->drvr;
2455	2680	struct {
2456	2681	__le32 len;
2457	2682	struct brcmf_bss_info_le bss_le;
..	..	@@ -2467,7 +2692,7 @@
2467	2692	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO, buf,
2468	2693	WL_BSS_INFO_MAX);
2469	2694	if (err) {
2470		- brcmf_err("Failed to get bss info (%d)\n", err);
	2695	+ bphy_err(drvr, "Failed to get bss info (%d)\n", err);
2471	2696	goto out_kfree;
2472	2697	}
2473	2698	si->filled \|= BIT_ULL(NL80211_STA_INFO_BSS_PARAM);
..	..	@@ -2489,6 +2714,7 @@
2489	2714	brcmf_cfg80211_get_station_ibss(struct brcmf_if *ifp,
2490	2715	struct station_info *sinfo)
2491	2716	{
	2717	+ struct brcmf_pub *drvr = ifp->drvr;
2492	2718	struct brcmf_scb_val_le scbval;
2493	2719	struct brcmf_pktcnt_le pktcnt;
2494	2720	s32 err;
..	..	@@ -2498,7 +2724,7 @@
2498	2724	/* Get the current tx rate */
2499	2725	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_RATE, &rate);
2500	2726	if (err < 0) {
2501		- brcmf_err("BRCMF_C_GET_RATE error (%d)\n", err);
	2727	+ bphy_err(drvr, "BRCMF_C_GET_RATE error (%d)\n", err);
2502	2728	return err;
2503	2729	}
2504	2730	sinfo->filled \|= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
..	..	@@ -2508,7 +2734,7 @@
2508	2734	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI, &scbval,
2509	2735	sizeof(scbval));
2510	2736	if (err) {
2511		- brcmf_err("BRCMF_C_GET_RSSI error (%d)\n", err);
	2737	+ bphy_err(drvr, "BRCMF_C_GET_RSSI error (%d)\n", err);
2512	2738	return err;
2513	2739	}
2514	2740	rssi = le32_to_cpu(scbval.val);
..	..	@@ -2518,7 +2744,7 @@
2518	2744	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_GET_PKTCNTS, &pktcnt,
2519	2745	sizeof(pktcnt));
2520	2746	if (err) {
2521		- brcmf_err("BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
	2747	+ bphy_err(drvr, "BRCMF_C_GET_GET_PKTCNTS error (%d)\n", err);
2522	2748	return err;
2523	2749	}
2524	2750	sinfo->filled \|= BIT_ULL(NL80211_STA_INFO_RX_PACKETS) \|
..	..	@@ -2537,7 +2763,9 @@
2537	2763	brcmf_cfg80211_get_station(struct wiphy wiphy, struct net_device ndev,
2538	2764	const u8 mac, struct station_info sinfo)
2539	2765	{
	2766	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2540	2767	struct brcmf_if *ifp = netdev_priv(ndev);
	2768	+ struct brcmf_pub *drvr = cfg->pub;
2541	2769	struct brcmf_scb_val_le scb_val;
2542	2770	s32 err = 0;
2543	2771	struct brcmf_sta_info_le sta_info_le;
..	..	@@ -2567,7 +2795,7 @@
2567	2795	&sta_info_le,
2568	2796	sizeof(sta_info_le));
2569	2797	if (err < 0) {
2570		- brcmf_err("GET STA INFO failed, %d\n", err);
	2798	+ bphy_err(drvr, "GET STA INFO failed, %d\n", err);
2571	2799	goto done;
2572	2800	}
2573	2801	}
..	..	@@ -2638,7 +2866,8 @@
2638	2866	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_RSSI,
2639	2867	&scb_val, sizeof(scb_val));
2640	2868	if (err) {
2641		- brcmf_err("Could not get rssi (%d)\n", err);
	2869	+ bphy_err(drvr, "Could not get rssi (%d)\n",
	2870	+ err);
2642	2871	goto done;
2643	2872	} else {
2644	2873	rssi = le32_to_cpu(scb_val.val);
..	..	@@ -2659,6 +2888,7 @@
2659	2888	{
2660	2889	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2661	2890	struct brcmf_if *ifp = netdev_priv(ndev);
	2891	+ struct brcmf_pub *drvr = cfg->pub;
2662	2892	s32 err;
2663	2893
2664	2894	brcmf_dbg(TRACE, "Enter, idx %d\n", idx);
..	..	@@ -2669,8 +2899,8 @@
2669	2899	&cfg->assoclist,
2670	2900	sizeof(cfg->assoclist));
2671	2901	if (err) {
2672		- brcmf_err("BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
2673		- err);
	2902	+ bphy_err(drvr, "BRCMF_C_GET_ASSOCLIST unsupported, err=%d\n",
	2903	+ err);
2674	2904	cfg->assoclist.count = 0;
2675	2905	return -EOPNOTSUPP;
2676	2906	}
..	..	@@ -2690,6 +2920,7 @@
2690	2920	s32 err = 0;
2691	2921	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
2692	2922	struct brcmf_if *ifp = netdev_priv(ndev);
	2923	+ struct brcmf_pub *drvr = cfg->pub;
2693	2924
2694	2925	brcmf_dbg(TRACE, "Enter\n");
2695	2926
..	..	@@ -2718,10 +2949,16 @@
2718	2949	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, pm);
2719	2950	if (err) {
2720	2951	if (err == -ENODEV)
2721		- brcmf_err("net_device is not ready yet\n");
	2952	+ bphy_err(drvr, "net_device is not ready yet\n");
2722	2953	else
2723		- brcmf_err("error (%d)\n", err);
	2954	+ bphy_err(drvr, "error (%d)\n", err);
2724	2955	}
	2956	+
	2957	+ err = brcmf_fil_iovar_int_set(ifp, "pm2_sleep_ret",
	2958	+ min_t(u32, timeout, BRCMF_PS_MAX_TIMEOUT_MS));
	2959	+ if (err)
	2960	+ bphy_err(drvr, "Unable to set pm timeout, (%d)\n", err);
	2961	+
2725	2962	done:
2726	2963	brcmf_dbg(TRACE, "Exit\n");
2727	2964	return err;
..	..	@@ -2731,6 +2968,7 @@
2731	2968	struct brcmf_bss_info_le *bi)
2732	2969	{
2733	2970	struct wiphy *wiphy = cfg_to_wiphy(cfg);
	2971	+ struct brcmf_pub *drvr = cfg->pub;
2734	2972	struct cfg80211_bss *bss;
2735	2973	enum nl80211_band band;
2736	2974	struct brcmu_chan ch;
..	..	@@ -2743,8 +2981,8 @@
2743	2981	struct cfg80211_inform_bss bss_data = {};
2744	2982
2745	2983	if (le32_to_cpu(bi->length) > WL_BSS_INFO_MAX) {
2746		- brcmf_err("Bss info is larger than buffer. Discarding\n");
2747		- return 0;
	2984	+ bphy_err(drvr, "Bss info is larger than buffer. Discarding\n");
	2985	+ return -EINVAL;
2748	2986	}
2749	2987
2750	2988	if (!bi->ctl_ch) {
..	..	@@ -2802,6 +3040,7 @@
2802	3040
2803	3041	static s32 brcmf_inform_bss(struct brcmf_cfg80211_info *cfg)
2804	3042	{
	3043	+ struct brcmf_pub *drvr = cfg->pub;
2805	3044	struct brcmf_scan_results *bss_list;
2806	3045	struct brcmf_bss_info_le bi = NULL; / must be initialized */
2807	3046	s32 err = 0;
..	..	@@ -2810,8 +3049,8 @@
2810	3049	bss_list = (struct brcmf_scan_results *)cfg->escan_info.escan_buf;
2811	3050	if (bss_list->count != 0 &&
2812	3051	bss_list->version != BRCMF_BSS_INFO_VERSION) {
2813		- brcmf_err("Version %d != WL_BSS_INFO_VERSION\n",
2814		- bss_list->version);
	3052	+ bphy_err(drvr, "Version %d != WL_BSS_INFO_VERSION\n",
	3053	+ bss_list->version);
2815	3054	return -EOPNOTSUPP;
2816	3055	}
2817	3056	brcmf_dbg(SCAN, "scanned AP count (%d)\n", bss_list->count);
..	..	@@ -2828,6 +3067,7 @@
2828	3067	struct net_device ndev, const u8 bssid)
2829	3068	{
2830	3069	struct wiphy *wiphy = cfg_to_wiphy(cfg);
	3070	+ struct brcmf_pub *drvr = cfg->pub;
2831	3071	struct ieee80211_channel *notify_channel;
2832	3072	struct brcmf_bss_info_le *bi = NULL;
2833	3073	struct ieee80211_supported_band *band;
..	..	@@ -2855,7 +3095,7 @@
2855	3095	err = brcmf_fil_cmd_data_get(netdev_priv(ndev), BRCMF_C_GET_BSS_INFO,
2856	3096	buf, WL_BSS_INFO_MAX);
2857	3097	if (err) {
2858		- brcmf_err("WLC_GET_BSS_INFO failed: %d\n", err);
	3098	+ bphy_err(drvr, "WLC_GET_BSS_INFO failed: %d\n", err);
2859	3099	goto CleanUp;
2860	3100	}
2861	3101
..	..	@@ -2909,10 +3149,9 @@
2909	3149	static s32 brcmf_update_bss_info(struct brcmf_cfg80211_info *cfg,
2910	3150	struct brcmf_if *ifp)
2911	3151	{
	3152	+ struct brcmf_pub *drvr = cfg->pub;
2912	3153	struct brcmf_bss_info_le *bi;
2913	3154	const struct brcmf_tlv *tim;
2914		- u16 beacon_interval;
2915		- u8 dtim_period;
2916	3155	size_t ie_len;
2917	3156	u8 *ie;
2918	3157	s32 err = 0;
..	..	@@ -2925,7 +3164,7 @@
2925	3164	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BSS_INFO,
2926	3165	cfg->extra_buf, WL_EXTRA_BUF_MAX);
2927	3166	if (err) {
2928		- brcmf_err("Could not get bss info %d\n", err);
	3167	+ bphy_err(drvr, "Could not get bss info %d\n", err);
2929	3168	goto update_bss_info_out;
2930	3169	}
2931	3170
..	..	@@ -2936,12 +3175,9 @@
2936	3175
2937	3176	ie = ((u8 *)bi) + le16_to_cpu(bi->ie_offset);
2938	3177	ie_len = le32_to_cpu(bi->ie_length);
2939		- beacon_interval = le16_to_cpu(bi->beacon_period);
2940	3178
2941	3179	tim = brcmf_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
2942		- if (tim)
2943		- dtim_period = tim->data[1];
2944		- else {
	3180	+ if (!tim) {
2945	3181	/*
2946	3182	* active scan was done so we could not get dtim
2947	3183	* information out of probe response.
..	..	@@ -2950,10 +3186,9 @@
2950	3186	u32 var;
2951	3187	err = brcmf_fil_iovar_int_get(ifp, "dtim_assoc", &var);
2952	3188	if (err) {
2953		- brcmf_err("wl dtim_assoc failed (%d)\n", err);
	3189	+ bphy_err(drvr, "wl dtim_assoc failed (%d)\n", err);
2954	3190	goto update_bss_info_out;
2955	3191	}
2956		- dtim_period = (u8)var;
2957	3192	}
2958	3193
2959	3194	update_bss_info_out:
..	..	@@ -2988,9 +3223,10 @@
2988	3223	{
2989	3224	struct brcmf_cfg80211_info *cfg =
2990	3225	from_timer(cfg, t, escan_timeout);
	3226	+ struct brcmf_pub *drvr = cfg->pub;
2991	3227
2992	3228	if (cfg->int_escan_map \|\| cfg->scan_request) {
2993		- brcmf_err("timer expired\n");
	3229	+ bphy_err(drvr, "timer expired\n");
2994	3230	schedule_work(&cfg->escan_timeout_work);
2995	3231	}
2996	3232	}
..	..	@@ -3038,7 +3274,8 @@
3038	3274	brcmf_cfg80211_escan_handler(struct brcmf_if *ifp,
3039	3275	const struct brcmf_event_msg e, void data)
3040	3276	{
3041		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3277	+ struct brcmf_pub *drvr = ifp->drvr;
	3278	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3042	3279	s32 status;
3043	3280	struct brcmf_escan_result_le *escan_result_le;
3044	3281	u32 escan_buflen;
..	..	@@ -3055,32 +3292,33 @@
3055	3292	goto exit;
3056	3293
3057	3294	if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
3058		- brcmf_err("scan not ready, bsscfgidx=%d\n", ifp->bsscfgidx);
	3295	+ bphy_err(drvr, "scan not ready, bsscfgidx=%d\n",
	3296	+ ifp->bsscfgidx);
3059	3297	return -EPERM;
3060	3298	}
3061	3299
3062	3300	if (status == BRCMF_E_STATUS_PARTIAL) {
3063	3301	brcmf_dbg(SCAN, "ESCAN Partial result\n");
3064	3302	if (e->datalen < sizeof(*escan_result_le)) {
3065		- brcmf_err("invalid event data length\n");
	3303	+ bphy_err(drvr, "invalid event data length\n");
3066	3304	goto exit;
3067	3305	}
3068	3306	escan_result_le = (struct brcmf_escan_result_le *) data;
3069	3307	if (!escan_result_le) {
3070		- brcmf_err("Invalid escan result (NULL pointer)\n");
	3308	+ bphy_err(drvr, "Invalid escan result (NULL pointer)\n");
3071	3309	goto exit;
3072	3310	}
3073	3311	escan_buflen = le32_to_cpu(escan_result_le->buflen);
3074	3312	if (escan_buflen > BRCMF_ESCAN_BUF_SIZE \|\|
3075	3313	escan_buflen > e->datalen \|\|
3076	3314	escan_buflen < sizeof(*escan_result_le)) {
3077		- brcmf_err("Invalid escan buffer length: %d\n",
3078		- escan_buflen);
	3315	+ bphy_err(drvr, "Invalid escan buffer length: %d\n",
	3316	+ escan_buflen);
3079	3317	goto exit;
3080	3318	}
3081	3319	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);
	3320	+ bphy_err(drvr, "Invalid bss_count %d: ignoring\n",
	3321	+ escan_result_le->bss_count);
3084	3322	goto exit;
3085	3323	}
3086	3324	bss_info_le = &escan_result_le->bss_info_le;
..	..	@@ -3095,8 +3333,8 @@
3095	3333
3096	3334	bi_length = le32_to_cpu(bss_info_le->length);
3097	3335	if (bi_length != escan_buflen - WL_ESCAN_RESULTS_FIXED_SIZE) {
3098		- brcmf_err("Ignoring invalid bss_info length: %d\n",
3099		- bi_length);
	3336	+ bphy_err(drvr, "Ignoring invalid bss_info length: %d\n",
	3337	+ bi_length);
3100	3338	goto exit;
3101	3339	}
3102	3340
..	..	@@ -3104,7 +3342,7 @@
3104	3342	BIT(NL80211_IFTYPE_ADHOC))) {
3105	3343	if (le16_to_cpu(bss_info_le->capability) &
3106	3344	WLAN_CAPABILITY_IBSS) {
3107		- brcmf_err("Ignoring IBSS result\n");
	3345	+ bphy_err(drvr, "Ignoring IBSS result\n");
3108	3346	goto exit;
3109	3347	}
3110	3348	}
..	..	@@ -3112,7 +3350,7 @@
3112	3350	list = (struct brcmf_scan_results *)
3113	3351	cfg->escan_info.escan_buf;
3114	3352	if (bi_length > BRCMF_ESCAN_BUF_SIZE - list->buflen) {
3115		- brcmf_err("Buffer is too small: ignoring\n");
	3353	+ bphy_err(drvr, "Buffer is too small: ignoring\n");
3116	3354	goto exit;
3117	3355	}
3118	3356
..	..	@@ -3248,7 +3486,7 @@
3248	3486	switch (pfn_v1->version) {
3249	3487	default:
3250	3488	WARN_ON(1);
3251		- /* fall-thru */
	3489	+ fallthrough;
3252	3490	case cpu_to_le32(1):
3253	3491	netinfo = (struct brcmf_pno_net_info_le *)(pfn_v1 + 1);
3254	3492	break;
..	..	@@ -3271,7 +3509,8 @@
3271	3509	brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
3272	3510	const struct brcmf_event_msg e, void data)
3273	3511	{
3274		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3512	+ struct brcmf_pub *drvr = ifp->drvr;
	3513	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3275	3514	struct brcmf_pno_net_info_le netinfo, netinfo_start;
3276	3515	struct cfg80211_scan_request *request = NULL;
3277	3516	struct wiphy *wiphy = cfg_to_wiphy(cfg);
..	..	@@ -3304,14 +3543,14 @@
3304	3543	WARN_ON(status != BRCMF_PNO_SCAN_COMPLETE);
3305	3544	brcmf_dbg(SCAN, "PFN NET FOUND event. count: %d\n", result_count);
3306	3545	if (!result_count) {
3307		- brcmf_err("FALSE PNO Event. (pfn_count == 0)\n");
	3546	+ bphy_err(drvr, "FALSE PNO Event. (pfn_count == 0)\n");
3308	3547	goto out_err;
3309	3548	}
3310	3549
3311	3550	netinfo_start = brcmf_get_netinfo_array(pfn_result);
3312	3551	datalen = e->datalen - ((void )netinfo_start - (void )pfn_result);
3313	3552	if (datalen < result_count * sizeof(*netinfo)) {
3314		- brcmf_err("insufficient event data\n");
	3553	+ bphy_err(drvr, "insufficient event data\n");
3315	3554	goto out_err;
3316	3555	}
3317	3556
..	..	@@ -3358,15 +3597,16 @@
3358	3597	struct net_device *ndev,
3359	3598	struct cfg80211_sched_scan_request *req)
3360	3599	{
3361		- struct brcmf_if *ifp = netdev_priv(ndev);
3362	3600	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	3601	+ struct brcmf_if *ifp = netdev_priv(ndev);
	3602	+ struct brcmf_pub *drvr = cfg->pub;
3363	3603
3364	3604	brcmf_dbg(SCAN, "Enter: n_match_sets=%d n_ssids=%d\n",
3365	3605	req->n_match_sets, req->n_ssids);
3366	3606
3367	3607	if (test_bit(BRCMF_SCAN_STATUS_SUPPRESS, &cfg->scan_status)) {
3368		- brcmf_err("Scanning suppressed: status=%lu\n",
3369		- cfg->scan_status);
	3608	+ bphy_err(drvr, "Scanning suppressed: status=%lu\n",
	3609	+ cfg->scan_status);
3370	3610	return -EAGAIN;
3371	3611	}
3372	3612
..	..	@@ -3444,7 +3684,8 @@
3444	3684	brcmf_wowl_nd_results(struct brcmf_if ifp, const struct brcmf_event_msg e,
3445	3685	void *data)
3446	3686	{
3447		- struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
	3687	+ struct brcmf_pub *drvr = ifp->drvr;
	3688	+ struct brcmf_cfg80211_info *cfg = drvr->config;
3448	3689	struct brcmf_pno_scanresults_le *pfn_result;
3449	3690	struct brcmf_pno_net_info_le *netinfo;
3450	3691
..	..	@@ -3463,8 +3704,8 @@
3463	3704	}
3464	3705
3465	3706	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));
	3707	+ bphy_err(drvr, "Invalid result count, expected 1 (%d)\n",
	3708	+ le32_to_cpu(pfn_result->count));
3468	3709	return -EINVAL;
3469	3710	}
3470	3711
..	..	@@ -3493,6 +3734,7 @@
3493	3734	static void brcmf_report_wowl_wakeind(struct wiphy wiphy, struct brcmf_if ifp)
3494	3735	{
3495	3736	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	3737	+ struct brcmf_pub *drvr = cfg->pub;
3496	3738	struct brcmf_wowl_wakeind_le wake_ind_le;
3497	3739	struct cfg80211_wowlan_wakeup wakeup_data;
3498	3740	struct cfg80211_wowlan_wakeup *wakeup;
..	..	@@ -3503,7 +3745,7 @@
3503	3745	err = brcmf_fil_iovar_data_get(ifp, "wowl_wakeind", &wake_ind_le,
3504	3746	sizeof(wake_ind_le));
3505	3747	if (err) {
3506		- brcmf_err("Get wowl_wakeind failed, err = %d\n", err);
	3748	+ bphy_err(drvr, "Get wowl_wakeind failed, err = %d\n", err);
3507	3749	return;
3508	3750	}
3509	3751
..	..	@@ -3544,7 +3786,7 @@
3544	3786	cfg->wowl.nd_data_completed,
3545	3787	BRCMF_ND_INFO_TIMEOUT);
3546	3788	if (!timeout)
3547		- brcmf_err("No result for wowl net detect\n");
	3789	+ bphy_err(drvr, "No result for wowl net detect\n");
3548	3790	else
3549	3791	wakeup_data.net_detect = cfg->wowl.nd_info;
3550	3792	}
..	..	@@ -3683,7 +3925,7 @@
3683	3925	* disassociate from AP to save power while system is
3684	3926	* in suspended state
3685	3927	*/
3686		- brcmf_link_down(vif, WLAN_REASON_UNSPECIFIED);
	3928	+ brcmf_link_down(vif, WLAN_REASON_UNSPECIFIED, true);
3687	3929	/* Make sure WPA_Supplicant receives all the event
3688	3930	* generated due to DISASSOC call to the fw to keep
3689	3931	* the state fw and WPA_Supplicant state consistent
..	..	@@ -3733,6 +3975,7 @@
3733	3975	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
3734	3976	struct brcmf_if *ifp = netdev_priv(ndev);
3735	3977	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
	3978	+ struct brcmf_pub *drvr = cfg->pub;
3736	3979	s32 err;
3737	3980	u32 npmk, i;
3738	3981
..	..	@@ -3752,15 +3995,12 @@
3752	3995	cfg->pmk_list.npmk = cpu_to_le32(npmk);
3753	3996	}
3754	3997	} else {
3755		- brcmf_err("Too many PMKSA entries cached %d\n", npmk);
	3998	+ bphy_err(drvr, "Too many PMKSA entries cached %d\n", npmk);
3756	3999	return -EINVAL;
3757	4000	}
3758	4001
3759	4002	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]);
	4003	+ brcmf_dbg(CONN, "%*ph\n", WLAN_PMKID_LEN, pmk[npmk].pmkid);
3764	4004
3765	4005	err = brcmf_update_pmklist(cfg, ifp);
3766	4006
..	..	@@ -3775,6 +4015,7 @@
3775	4015	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
3776	4016	struct brcmf_if *ifp = netdev_priv(ndev);
3777	4017	struct brcmf_pmksa *pmk = &cfg->pmk_list.pmk[0];
	4018	+ struct brcmf_pub *drvr = cfg->pub;
3778	4019	s32 err;
3779	4020	u32 npmk, i;
3780	4021
..	..	@@ -3798,7 +4039,7 @@
3798	4039	memset(&pmk[i], 0, sizeof(*pmk));
3799	4040	cfg->pmk_list.npmk = cpu_to_le32(npmk - 1);
3800	4041	} else {
3801		- brcmf_err("Cache entry not found\n");
	4042	+ bphy_err(drvr, "Cache entry not found\n");
3802	4043	return -EINVAL;
3803	4044	}
3804	4045
..	..	@@ -3830,19 +4071,20 @@
3830	4071
3831	4072	static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp)
3832	4073	{
	4074	+ struct brcmf_pub *drvr = ifp->drvr;
3833	4075	s32 err;
3834	4076	s32 wpa_val;
3835	4077
3836	4078	/* set auth */
3837	4079	err = brcmf_fil_bsscfg_int_set(ifp, "auth", 0);
3838	4080	if (err < 0) {
3839		- brcmf_err("auth error %d\n", err);
	4081	+ bphy_err(drvr, "auth error %d\n", err);
3840	4082	return err;
3841	4083	}
3842	4084	/* set wsec */
3843	4085	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", 0);
3844	4086	if (err < 0) {
3845		- brcmf_err("wsec error %d\n", err);
	4087	+ bphy_err(drvr, "wsec error %d\n", err);
3846	4088	return err;
3847	4089	}
3848	4090	/* set upper-layer auth */
..	..	@@ -3852,7 +4094,7 @@
3852	4094	wpa_val = WPA_AUTH_DISABLED;
3853	4095	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_val);
3854	4096	if (err < 0) {
3855		- brcmf_err("wpa_auth error %d\n", err);
	4097	+ bphy_err(drvr, "wpa_auth error %d\n", err);
3856	4098	return err;
3857	4099	}
3858	4100
..	..	@@ -3872,6 +4114,7 @@
3872	4114	const struct brcmf_vs_tlv *wpa_ie,
3873	4115	bool is_rsn_ie)
3874	4116	{
	4117	+ struct brcmf_pub *drvr = ifp->drvr;
3875	4118	u32 auth = 0; /* d11 open authentication */
3876	4119	u16 count;
3877	4120	s32 err = 0;
..	..	@@ -3902,13 +4145,13 @@
3902	4145	/* check for multicast cipher suite */
3903	4146	if (offset + WPA_IE_MIN_OUI_LEN > len) {
3904	4147	err = -EINVAL;
3905		- brcmf_err("no multicast cipher suite\n");
	4148	+ bphy_err(drvr, "no multicast cipher suite\n");
3906	4149	goto exit;
3907	4150	}
3908	4151
3909	4152	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3910	4153	err = -EINVAL;
3911		- brcmf_err("ivalid OUI\n");
	4154	+ bphy_err(drvr, "ivalid OUI\n");
3912	4155	goto exit;
3913	4156	}
3914	4157	offset += TLV_OUI_LEN;
..	..	@@ -3930,7 +4173,7 @@
3930	4173	break;
3931	4174	default:
3932	4175	err = -EINVAL;
3933		- brcmf_err("Invalid multi cast cipher info\n");
	4176	+ bphy_err(drvr, "Invalid multi cast cipher info\n");
3934	4177	goto exit;
3935	4178	}
3936	4179
..	..	@@ -3941,13 +4184,13 @@
3941	4184	/* Check for unicast suite(s) */
3942	4185	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
3943	4186	err = -EINVAL;
3944		- brcmf_err("no unicast cipher suite\n");
	4187	+ bphy_err(drvr, "no unicast cipher suite\n");
3945	4188	goto exit;
3946	4189	}
3947	4190	for (i = 0; i < count; i++) {
3948	4191	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3949	4192	err = -EINVAL;
3950		- brcmf_err("ivalid OUI\n");
	4193	+ bphy_err(drvr, "ivalid OUI\n");
3951	4194	goto exit;
3952	4195	}
3953	4196	offset += TLV_OUI_LEN;
..	..	@@ -3965,7 +4208,7 @@
3965	4208	pval \|= AES_ENABLED;
3966	4209	break;
3967	4210	default:
3968		- brcmf_err("Invalid unicast security info\n");
	4211	+ bphy_err(drvr, "Invalid unicast security info\n");
3969	4212	}
3970	4213	offset++;
3971	4214	}
..	..	@@ -3975,13 +4218,13 @@
3975	4218	/* Check for auth key management suite(s) */
3976	4219	if (offset + (WPA_IE_MIN_OUI_LEN * count) > len) {
3977	4220	err = -EINVAL;
3978		- brcmf_err("no auth key mgmt suite\n");
	4221	+ bphy_err(drvr, "no auth key mgmt suite\n");
3979	4222	goto exit;
3980	4223	}
3981	4224	for (i = 0; i < count; i++) {
3982	4225	if (!brcmf_valid_wpa_oui(&data[offset], is_rsn_ie)) {
3983	4226	err = -EINVAL;
3984		- brcmf_err("ivalid OUI\n");
	4227	+ bphy_err(drvr, "ivalid OUI\n");
3985	4228	goto exit;
3986	4229	}
3987	4230	offset += TLV_OUI_LEN;
..	..	@@ -4008,8 +4251,12 @@
4008	4251	brcmf_dbg(TRACE, "RSN_AKM_MFP_1X\n");
4009	4252	wpa_auth \|= WPA2_AUTH_1X_SHA256;
4010	4253	break;
	4254	+ case RSN_AKM_SAE:
	4255	+ brcmf_dbg(TRACE, "RSN_AKM_SAE\n");
	4256	+ wpa_auth \|= WPA3_AUTH_SAE_PSK;
	4257	+ break;
4011	4258	default:
4012		- brcmf_err("Invalid key mgmt info\n");
	4259	+ bphy_err(drvr, "Invalid key mgmt info\n");
4013	4260	}
4014	4261	offset++;
4015	4262	}
..	..	@@ -4025,11 +4272,12 @@
4025	4272	brcmf_dbg(TRACE, "MFP Required\n");
4026	4273	mfp = BRCMF_MFP_REQUIRED;
4027	4274	/* Firmware only supports mfp required in
4028		- * combination with WPA2_AUTH_PSK_SHA256 or
4029		- * WPA2_AUTH_1X_SHA256.
	4275	+ * combination with WPA2_AUTH_PSK_SHA256,
	4276	+ * WPA2_AUTH_1X_SHA256, or WPA3_AUTH_SAE_PSK.
4030	4277	*/
4031	4278	if (!(wpa_auth & (WPA2_AUTH_PSK_SHA256 \|
4032		- WPA2_AUTH_1X_SHA256))) {
	4279	+ WPA2_AUTH_1X_SHA256 \|
	4280	+ WPA3_AUTH_SAE_PSK))) {
4033	4281	err = -EINVAL;
4034	4282	goto exit;
4035	4283	}
..	..	@@ -4051,7 +4299,7 @@
4051	4299	err = brcmf_fil_bsscfg_int_set(ifp, "wme_bss_disable",
4052	4300	wme_bss_disable);
4053	4301	if (err < 0) {
4054		- brcmf_err("wme_bss_disable error %d\n", err);
	4302	+ bphy_err(drvr, "wme_bss_disable error %d\n", err);
4055	4303	goto exit;
4056	4304	}
4057	4305
..	..	@@ -4065,7 +4313,7 @@
4065	4313	&data[offset],
4066	4314	WPA_IE_MIN_OUI_LEN);
4067	4315	if (err < 0) {
4068		- brcmf_err("bip error %d\n", err);
	4316	+ bphy_err(drvr, "bip error %d\n", err);
4069	4317	goto exit;
4070	4318	}
4071	4319	}
..	..	@@ -4076,13 +4324,13 @@
4076	4324	/* set auth */
4077	4325	err = brcmf_fil_bsscfg_int_set(ifp, "auth", auth);
4078	4326	if (err < 0) {
4079		- brcmf_err("auth error %d\n", err);
	4327	+ bphy_err(drvr, "auth error %d\n", err);
4080	4328	goto exit;
4081	4329	}
4082	4330	/* set wsec */
4083	4331	err = brcmf_fil_bsscfg_int_set(ifp, "wsec", wsec);
4084	4332	if (err < 0) {
4085		- brcmf_err("wsec error %d\n", err);
	4333	+ bphy_err(drvr, "wsec error %d\n", err);
4086	4334	goto exit;
4087	4335	}
4088	4336	/* Configure MFP, this needs to go after wsec otherwise the wsec command
..	..	@@ -4091,14 +4339,14 @@
4091	4339	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP)) {
4092	4340	err = brcmf_fil_bsscfg_int_set(ifp, "mfp", mfp);
4093	4341	if (err < 0) {
4094		- brcmf_err("mfp error %d\n", err);
	4342	+ bphy_err(drvr, "mfp error %d\n", err);
4095	4343	goto exit;
4096	4344	}
4097	4345	}
4098	4346	/* set upper-layer auth */
4099	4347	err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_auth);
4100	4348	if (err < 0) {
4101		- brcmf_err("wpa_auth error %d\n", err);
	4349	+ bphy_err(drvr, "wpa_auth error %d\n", err);
4102	4350	goto exit;
4103	4351	}
4104	4352
..	..	@@ -4146,10 +4394,8 @@
4146	4394
4147	4395	vndr_ies->count++;
4148	4396
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],
	4397	+ brcmf_dbg(TRACE, "** OUI %3ph, type 0x%02x\n",
	4398	+ parsed_info->vndrie.oui,
4153	4399	parsed_info->vndrie.oui_type);
4154	4400
4155	4401	if (vndr_ies->count >= VNDR_IE_PARSE_LIMIT)
..	..	@@ -4168,9 +4414,7 @@
4168	4414	static u32
4169	4415	brcmf_vndr_ie(u8 iebuf, s32 pktflag, u8 ie_ptr, u32 ie_len, s8 *add_del_cmd)
4170	4416	{
4171		-
4172		- strncpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN - 1);
4173		- iebuf[VNDR_IE_CMD_LEN - 1] = '\0';
	4417	+ strscpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN);
4174	4418
4175	4419	put_unaligned_le32(1, &iebuf[VNDR_IE_COUNT_OFFSET]);
4176	4420
..	..	@@ -4184,6 +4428,7 @@
4184	4428	s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
4185	4429	const u8 *vndr_ie_buf, u32 vndr_ie_len)
4186	4430	{
	4431	+ struct brcmf_pub *drvr;
4187	4432	struct brcmf_if *ifp;
4188	4433	struct vif_saved_ie *saved_ie;
4189	4434	s32 err = 0;
..	..	@@ -4205,6 +4450,7 @@
4205	4450	if (!vif)
4206	4451	return -ENODEV;
4207	4452	ifp = vif->ifp;
	4453	+ drvr = ifp->drvr;
4208	4454	saved_ie = &vif->saved_ie;
4209	4455
4210	4456	brcmf_dbg(TRACE, "bsscfgidx %d, pktflag : 0x%02X\n", ifp->bsscfgidx,
..	..	@@ -4234,15 +4480,20 @@
4234	4480	mgmt_ie_len = &saved_ie->assoc_req_ie_len;
4235	4481	mgmt_ie_buf_len = sizeof(saved_ie->assoc_req_ie);
4236	4482	break;
	4483	+ case BRCMF_VNDR_IE_ASSOCRSP_FLAG:
	4484	+ mgmt_ie_buf = saved_ie->assoc_res_ie;
	4485	+ mgmt_ie_len = &saved_ie->assoc_res_ie_len;
	4486	+ mgmt_ie_buf_len = sizeof(saved_ie->assoc_res_ie);
	4487	+ break;
4237	4488	default:
4238	4489	err = -EPERM;
4239		- brcmf_err("not suitable type\n");
	4490	+ bphy_err(drvr, "not suitable type\n");
4240	4491	goto exit;
4241	4492	}
4242	4493
4243	4494	if (vndr_ie_len > mgmt_ie_buf_len) {
4244	4495	err = -ENOMEM;
4245		- brcmf_err("extra IE size too big\n");
	4496	+ bphy_err(drvr, "extra IE size too big\n");
4246	4497	goto exit;
4247	4498	}
4248	4499
..	..	@@ -4273,12 +4524,10 @@
4273	4524	for (i = 0; i < old_vndr_ies.count; i++) {
4274	4525	vndrie_info = &old_vndr_ies.ie_info[i];
4275	4526
4276		- brcmf_dbg(TRACE, "DEL ID : %d, Len: %d , OUI:%02x:%02x:%02x\n",
	4527	+ brcmf_dbg(TRACE, "DEL ID : %d, Len: %d , OUI:%3ph\n",
4277	4528	vndrie_info->vndrie.id,
4278	4529	vndrie_info->vndrie.len,
4279		- vndrie_info->vndrie.oui[0],
4280		- vndrie_info->vndrie.oui[1],
4281		- vndrie_info->vndrie.oui[2]);
	4530	+ vndrie_info->vndrie.oui);
4282	4531
4283	4532	del_add_ie_buf_len = brcmf_vndr_ie(curr_ie_buf, pktflag,
4284	4533	vndrie_info->ie_ptr,
..	..	@@ -4303,19 +4552,17 @@
4303	4552	/* verify remained buf size before copy data */
4304	4553	if (remained_buf_len < (vndrie_info->vndrie.len +
4305	4554	VNDR_IE_VSIE_OFFSET)) {
4306		- brcmf_err("no space in mgmt_ie_buf: len left %d",
4307		- remained_buf_len);
	4555	+ bphy_err(drvr, "no space in mgmt_ie_buf: len left %d",
	4556	+ remained_buf_len);
4308	4557	break;
4309	4558	}
4310	4559	remained_buf_len -= (vndrie_info->ie_len +
4311	4560	VNDR_IE_VSIE_OFFSET);
4312	4561
4313		- brcmf_dbg(TRACE, "ADDED ID : %d, Len: %d, OUI:%02x:%02x:%02x\n",
	4562	+ brcmf_dbg(TRACE, "ADDED ID : %d, Len: %d, OUI:%3ph\n",
4314	4563	vndrie_info->vndrie.id,
4315	4564	vndrie_info->vndrie.len,
4316		- vndrie_info->vndrie.oui[0],
4317		- vndrie_info->vndrie.oui[1],
4318		- vndrie_info->vndrie.oui[2]);
	4565	+ vndrie_info->vndrie.oui);
4319	4566
4320	4567	del_add_ie_buf_len = brcmf_vndr_ie(curr_ie_buf, pktflag,
4321	4568	vndrie_info->ie_ptr,
..	..	@@ -4335,7 +4582,7 @@
4335	4582	err = brcmf_fil_bsscfg_data_set(ifp, "vndr_ie", iovar_ie_buf,
4336	4583	total_ie_buf_len);
4337	4584	if (err)
4338		- brcmf_err("vndr ie set error : %d\n", err);
	4585	+ bphy_err(drvr, "vndr ie set error : %d\n", err);
4339	4586	}
4340	4587
4341	4588	exit:
..	..	@@ -4363,13 +4610,14 @@
4363	4610	brcmf_config_ap_mgmt_ie(struct brcmf_cfg80211_vif *vif,
4364	4611	struct cfg80211_beacon_data *beacon)
4365	4612	{
	4613	+ struct brcmf_pub *drvr = vif->ifp->drvr;
4366	4614	s32 err;
4367	4615
4368	4616	/* Set Beacon IEs to FW */
4369	4617	err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_BEACON_FLAG,
4370	4618	beacon->tail, beacon->tail_len);
4371	4619	if (err) {
4372		- brcmf_err("Set Beacon IE Failed\n");
	4620	+ bphy_err(drvr, "Set Beacon IE Failed\n");
4373	4621	return err;
4374	4622	}
4375	4623	brcmf_dbg(TRACE, "Applied Vndr IEs for Beacon\n");
..	..	@@ -4379,9 +4627,60 @@
4379	4627	beacon->proberesp_ies,
4380	4628	beacon->proberesp_ies_len);
4381	4629	if (err)
4382		- brcmf_err("Set Probe Resp IE Failed\n");
	4630	+ bphy_err(drvr, "Set Probe Resp IE Failed\n");
4383	4631	else
4384	4632	brcmf_dbg(TRACE, "Applied Vndr IEs for Probe Resp\n");
	4633	+
	4634	+ /* Set Assoc Response IEs to FW */
	4635	+ err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_ASSOCRSP_FLAG,
	4636	+ beacon->assocresp_ies,
	4637	+ beacon->assocresp_ies_len);
	4638	+ if (err)
	4639	+ brcmf_err("Set Assoc Resp IE Failed\n");
	4640	+ else
	4641	+ brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc Resp\n");
	4642	+
	4643	+ return err;
	4644	+}
	4645	+
	4646	+static s32
	4647	+brcmf_parse_configure_security(struct brcmf_if *ifp,
	4648	+ struct cfg80211_ap_settings *settings,
	4649	+ enum nl80211_iftype dev_role)
	4650	+{
	4651	+ const struct brcmf_tlv *rsn_ie;
	4652	+ const struct brcmf_vs_tlv *wpa_ie;
	4653	+ s32 err = 0;
	4654	+
	4655	+ /* find the RSN_IE */
	4656	+ rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
	4657	+ settings->beacon.tail_len, WLAN_EID_RSN);
	4658	+
	4659	+ /* find the WPA_IE */
	4660	+ wpa_ie = brcmf_find_wpaie((u8 *)settings->beacon.tail,
	4661	+ settings->beacon.tail_len);
	4662	+
	4663	+ if (wpa_ie \|\| rsn_ie) {
	4664	+ brcmf_dbg(TRACE, "WPA(2) IE is found\n");
	4665	+ if (wpa_ie) {
	4666	+ /* WPA IE */
	4667	+ err = brcmf_configure_wpaie(ifp, wpa_ie, false);
	4668	+ if (err < 0)
	4669	+ return err;
	4670	+ } else {
	4671	+ struct brcmf_vs_tlv *tmp_ie;
	4672	+
	4673	+ tmp_ie = (struct brcmf_vs_tlv *)rsn_ie;
	4674	+
	4675	+ /* RSN IE */
	4676	+ err = brcmf_configure_wpaie(ifp, tmp_ie, true);
	4677	+ if (err < 0)
	4678	+ return err;
	4679	+ }
	4680	+ } else {
	4681	+ brcmf_dbg(TRACE, "No WPA(2) IEs found\n");
	4682	+ brcmf_configure_opensecurity(ifp);
	4683	+ }
4385	4684
4386	4685	return err;
4387	4686	}
..	..	@@ -4393,12 +4692,13 @@
4393	4692	s32 ie_offset;
4394	4693	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4395	4694	struct brcmf_if *ifp = netdev_priv(ndev);
	4695	+ struct brcmf_pub *drvr = cfg->pub;
	4696	+ struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
	4697	+ struct cfg80211_crypto_settings *crypto = &settings->crypto;
4396	4698	const struct brcmf_tlv *ssid_ie;
4397	4699	const struct brcmf_tlv *country_ie;
4398	4700	struct brcmf_ssid_le ssid_le;
4399	4701	s32 err = -EPERM;
4400		- const struct brcmf_tlv *rsn_ie;
4401		- const struct brcmf_vs_tlv *wpa_ie;
4402	4702	struct brcmf_join_params join_params;
4403	4703	enum nl80211_iftype dev_role;
4404	4704	struct brcmf_fil_bss_enable_le bss_enable;
..	..	@@ -4452,43 +4752,14 @@
4452	4752	brcmf_configure_arp_nd_offload(ifp, false);
4453	4753	}
4454	4754
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	4755	/* Parameters shared by all radio interfaces */
4486	4756	if (!mbss) {
4487	4757	if ((supports_11d) && (is_11d != ifp->vif->is_11d)) {
4488	4758	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
4489	4759	is_11d);
4490	4760	if (err < 0) {
4491		- brcmf_err("Regulatory Set Error, %d\n", err);
	4761	+ bphy_err(drvr, "Regulatory Set Error, %d\n",
	4762	+ err);
4492	4763	goto exit;
4493	4764	}
4494	4765	}
..	..	@@ -4496,8 +4767,8 @@
4496	4767	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_BCNPRD,
4497	4768	settings->beacon_interval);
4498	4769	if (err < 0) {
4499		- brcmf_err("Beacon Interval Set Error, %d\n",
4500		- err);
	4770	+ bphy_err(drvr, "Beacon Interval Set Error, %d\n",
	4771	+ err);
4501	4772	goto exit;
4502	4773	}
4503	4774	}
..	..	@@ -4505,17 +4776,20 @@
4505	4776	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_DTIMPRD,
4506	4777	settings->dtim_period);
4507	4778	if (err < 0) {
4508		- brcmf_err("DTIM Interval Set Error, %d\n", err);
	4779	+ bphy_err(drvr, "DTIM Interval Set Error, %d\n",
	4780	+ err);
4509	4781	goto exit;
4510	4782	}
4511	4783	}
4512	4784
4513	4785	if ((dev_role == NL80211_IFTYPE_AP) &&
4514	4786	((ifp->ifidx == 0) \|\|
4515		- !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB))) {
	4787	+ (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB) &&
	4788	+ !brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)))) {
4516	4789	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
4517	4790	if (err < 0) {
4518		- brcmf_err("BRCMF_C_DOWN error %d\n", err);
	4791	+ bphy_err(drvr, "BRCMF_C_DOWN error %d\n",
	4792	+ err);
4519	4793	goto exit;
4520	4794	}
4521	4795	brcmf_fil_iovar_int_set(ifp, "apsta", 0);
..	..	@@ -4523,7 +4797,7 @@
4523	4797
4524	4798	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 1);
4525	4799	if (err < 0) {
4526		- brcmf_err("SET INFRA error %d\n", err);
	4800	+ bphy_err(drvr, "SET INFRA error %d\n", err);
4527	4801	goto exit;
4528	4802	}
4529	4803	} else if (WARN_ON(supports_11d && (is_11d != ifp->vif->is_11d))) {
..	..	@@ -4539,7 +4813,8 @@
4539	4813
4540	4814	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 1);
4541	4815	if (err < 0) {
4542		- brcmf_err("setting AP mode failed %d\n", err);
	4816	+ bphy_err(drvr, "setting AP mode failed %d\n",
	4817	+ err);
4543	4818	goto exit;
4544	4819	}
4545	4820	if (!mbss) {
..	..	@@ -4548,16 +4823,43 @@
4548	4823	*/
4549	4824	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
4550	4825	if (err < 0) {
4551		- brcmf_err("Set Channel failed: chspec=%d, %d\n",
4552		- chanspec, err);
	4826	+ bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
	4827	+ chanspec, err);
4553	4828	goto exit;
4554	4829	}
4555	4830	}
4556	4831	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
4557	4832	if (err < 0) {
4558		- brcmf_err("BRCMF_C_UP error (%d)\n", err);
	4833	+ bphy_err(drvr, "BRCMF_C_UP error (%d)\n", err);
4559	4834	goto exit;
4560	4835	}
	4836	+
	4837	+ if (crypto->psk) {
	4838	+ brcmf_dbg(INFO, "using PSK offload\n");
	4839	+ profile->use_fwauth \|= BIT(BRCMF_PROFILE_FWAUTH_PSK);
	4840	+ err = brcmf_set_pmk(ifp, crypto->psk,
	4841	+ BRCMF_WSEC_MAX_PSK_LEN);
	4842	+ if (err < 0)
	4843	+ goto exit;
	4844	+ }
	4845	+ if (crypto->sae_pwd) {
	4846	+ brcmf_dbg(INFO, "using SAE offload\n");
	4847	+ profile->use_fwauth \|= BIT(BRCMF_PROFILE_FWAUTH_SAE);
	4848	+ err = brcmf_set_sae_password(ifp, crypto->sae_pwd,
	4849	+ crypto->sae_pwd_len);
	4850	+ if (err < 0)
	4851	+ goto exit;
	4852	+ }
	4853	+ if (profile->use_fwauth == 0)
	4854	+ profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
	4855	+
	4856	+ err = brcmf_parse_configure_security(ifp, settings,
	4857	+ NL80211_IFTYPE_AP);
	4858	+ if (err < 0) {
	4859	+ bphy_err(drvr, "brcmf_parse_configure_security error\n");
	4860	+ goto exit;
	4861	+ }
	4862	+
4561	4863	/* On DOWN the firmware removes the WEP keys, reconfigure
4562	4864	* them if they were set.
4563	4865	*/
..	..	@@ -4570,30 +4872,40 @@
4570	4872	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
4571	4873	&join_params, sizeof(join_params));
4572	4874	if (err < 0) {
4573		- brcmf_err("SET SSID error (%d)\n", err);
	4875	+ bphy_err(drvr, "SET SSID error (%d)\n", err);
4574	4876	goto exit;
4575	4877	}
4576	4878
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		- }
	4879	+ err = brcmf_fil_iovar_int_set(ifp, "closednet",
	4880	+ settings->hidden_ssid);
	4881	+ if (err) {
	4882	+ bphy_err(drvr, "%s closednet error (%d)\n",
	4883	+ settings->hidden_ssid ?
	4884	+ "enabled" : "disabled",
	4885	+ err);
	4886	+ goto exit;
4583	4887	}
4584	4888
4585	4889	brcmf_dbg(TRACE, "AP mode configuration complete\n");
4586	4890	} else if (dev_role == NL80211_IFTYPE_P2P_GO) {
4587	4891	err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
4588	4892	if (err < 0) {
4589		- brcmf_err("Set Channel failed: chspec=%d, %d\n",
4590		- chanspec, err);
	4893	+ bphy_err(drvr, "Set Channel failed: chspec=%d, %d\n",
	4894	+ chanspec, err);
4591	4895	goto exit;
4592	4896	}
	4897	+
	4898	+ err = brcmf_parse_configure_security(ifp, settings,
	4899	+ NL80211_IFTYPE_P2P_GO);
	4900	+ if (err < 0) {
	4901	+ brcmf_err("brcmf_parse_configure_security error\n");
	4902	+ goto exit;
	4903	+ }
	4904	+
4593	4905	err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
4594	4906	sizeof(ssid_le));
4595	4907	if (err < 0) {
4596		- brcmf_err("setting ssid failed %d\n", err);
	4908	+ bphy_err(drvr, "setting ssid failed %d\n", err);
4597	4909	goto exit;
4598	4910	}
4599	4911	bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
..	..	@@ -4601,7 +4913,7 @@
4601	4913	err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
4602	4914	sizeof(bss_enable));
4603	4915	if (err < 0) {
4604		- brcmf_err("bss_enable config failed %d\n", err);
	4916	+ bphy_err(drvr, "bss_enable config failed %d\n", err);
4605	4917	goto exit;
4606	4918	}
4607	4919
..	..	@@ -4624,7 +4936,10 @@
4624	4936
4625	4937	static int brcmf_cfg80211_stop_ap(struct wiphy wiphy, struct net_device ndev)
4626	4938	{
	4939	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4627	4940	struct brcmf_if *ifp = netdev_priv(ndev);
	4941	+ struct brcmf_pub *drvr = cfg->pub;
	4942	+ struct brcmf_cfg80211_profile *profile = &ifp->vif->profile;
4628	4943	s32 err;
4629	4944	struct brcmf_fil_bss_enable_le bss_enable;
4630	4945	struct brcmf_join_params join_params;
..	..	@@ -4635,6 +4950,14 @@
4635	4950	/* Due to most likely deauths outstanding we sleep */
4636	4951	/* first to make sure they get processed by fw. */
4637	4952	msleep(400);
	4953	+
	4954	+ if (profile->use_fwauth != BIT(BRCMF_PROFILE_FWAUTH_NONE)) {
	4955	+ if (profile->use_fwauth & BIT(BRCMF_PROFILE_FWAUTH_PSK))
	4956	+ brcmf_set_pmk(ifp, NULL, 0);
	4957	+ if (profile->use_fwauth & BIT(BRCMF_PROFILE_FWAUTH_SAE))
	4958	+ brcmf_set_sae_password(ifp, NULL, 0);
	4959	+ profile->use_fwauth = BIT(BRCMF_PROFILE_FWAUTH_NONE);
	4960	+ }
4638	4961
4639	4962	if (ifp->vif->mbss) {
4640	4963	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
..	..	@@ -4649,13 +4972,13 @@
4649	4972	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
4650	4973	&join_params, sizeof(join_params));
4651	4974	if (err < 0)
4652		- brcmf_err("SET SSID error (%d)\n", err);
	4975	+ bphy_err(drvr, "SET SSID error (%d)\n", err);
4653	4976	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
4654	4977	if (err < 0)
4655		- brcmf_err("BRCMF_C_DOWN error %d\n", err);
	4978	+ bphy_err(drvr, "BRCMF_C_DOWN error %d\n", err);
4656	4979	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
4657	4980	if (err < 0)
4658		- brcmf_err("setting AP mode failed %d\n", err);
	4981	+ bphy_err(drvr, "setting AP mode failed %d\n", err);
4659	4982	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
4660	4983	brcmf_fil_iovar_int_set(ifp, "mbss", 0);
4661	4984	brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
..	..	@@ -4663,7 +4986,7 @@
4663	4986	/* Bring device back up so it can be used again */
4664	4987	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
4665	4988	if (err < 0)
4666		- brcmf_err("BRCMF_C_UP error %d\n", err);
	4989	+ bphy_err(drvr, "BRCMF_C_UP error %d\n", err);
4667	4990
4668	4991	brcmf_vif_clear_mgmt_ies(ifp->vif);
4669	4992	} else {
..	..	@@ -4672,7 +4995,7 @@
4672	4995	err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
4673	4996	sizeof(bss_enable));
4674	4997	if (err < 0)
4675		- brcmf_err("bss_enable config failed %d\n", err);
	4998	+ bphy_err(drvr, "bss_enable config failed %d\n", err);
4676	4999	}
4677	5000	brcmf_set_mpc(ifp, 1);
4678	5001	brcmf_configure_arp_nd_offload(ifp, true);
..	..	@@ -4701,6 +5024,7 @@
4701	5024	struct station_del_parameters *params)
4702	5025	{
4703	5026	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5027	+ struct brcmf_pub *drvr = cfg->pub;
4704	5028	struct brcmf_scb_val_le scbval;
4705	5029	struct brcmf_if *ifp = netdev_priv(ndev);
4706	5030	s32 err;
..	..	@@ -4720,7 +5044,8 @@
4720	5044	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,
4721	5045	&scbval, sizeof(scbval));
4722	5046	if (err)
4723		- brcmf_err("SCB_DEAUTHENTICATE_FOR_REASON failed %d\n", err);
	5047	+ bphy_err(drvr, "SCB_DEAUTHENTICATE_FOR_REASON failed %d\n",
	5048	+ err);
4724	5049
4725	5050	brcmf_dbg(TRACE, "Exit\n");
4726	5051	return err;
..	..	@@ -4730,6 +5055,8 @@
4730	5055	brcmf_cfg80211_change_station(struct wiphy wiphy, struct net_device ndev,
4731	5056	const u8 mac, struct station_parameters params)
4732	5057	{
	5058	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5059	+ struct brcmf_pub *drvr = cfg->pub;
4733	5060	struct brcmf_if *ifp = netdev_priv(ndev);
4734	5061	s32 err;
4735	5062
..	..	@@ -4750,27 +5077,21 @@
4750	5077	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_DEAUTHORIZE,
4751	5078	(void *)mac, ETH_ALEN);
4752	5079	if (err < 0)
4753		- brcmf_err("Setting SCB (de-)authorize failed, %d\n", err);
	5080	+ bphy_err(drvr, "Setting SCB (de-)authorize failed, %d\n", err);
4754	5081
4755	5082	return err;
4756	5083	}
4757	5084
4758	5085	static void
4759		-brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
4760		- struct wireless_dev *wdev,
4761		- u16 frame_type, bool reg)
	5086	+brcmf_cfg80211_update_mgmt_frame_registrations(struct wiphy *wiphy,
	5087	+ struct wireless_dev *wdev,
	5088	+ struct mgmt_frame_regs *upd)
4762	5089	{
4763	5090	struct brcmf_cfg80211_vif *vif;
4764		- u16 mgmt_type;
4765	5091
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	5092	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);
	5093	+
	5094	+ vif->mgmt_rx_reg = upd->interface_stypes;
4774	5095	}
4775	5096
4776	5097
..	..	@@ -4780,6 +5101,7 @@
4780	5101	{
4781	5102	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4782	5103	struct ieee80211_channel *chan = params->chan;
	5104	+ struct brcmf_pub *drvr = cfg->pub;
4783	5105	const u8 *buf = params->buf;
4784	5106	size_t len = params->len;
4785	5107	const struct ieee80211_mgmt *mgmt;
..	..	@@ -4800,7 +5122,7 @@
4800	5122	mgmt = (const struct ieee80211_mgmt *)buf;
4801	5123
4802	5124	if (!ieee80211_is_mgmt(mgmt->frame_control)) {
4803		- brcmf_err("Driver only allows MGMT packet type\n");
	5125	+ bphy_err(drvr, "Driver only allows MGMT packet type\n");
4804	5126	return -EPERM;
4805	5127	}
4806	5128
..	..	@@ -4831,13 +5153,13 @@
4831	5153	GFP_KERNEL);
4832	5154	} else if (ieee80211_is_action(mgmt->frame_control)) {
4833	5155	if (len > BRCMF_FIL_ACTION_FRAME_SIZE + DOT11_MGMT_HDR_LEN) {
4834		- brcmf_err("invalid action frame length\n");
	5156	+ bphy_err(drvr, "invalid action frame length\n");
4835	5157	err = -EINVAL;
4836	5158	goto exit;
4837	5159	}
4838	5160	af_params = kzalloc(sizeof(*af_params), GFP_KERNEL);
4839	5161	if (af_params == NULL) {
4840		- brcmf_err("unable to allocate frame\n");
	5162	+ bphy_err(drvr, "unable to allocate frame\n");
4841	5163	err = -ENOMEM;
4842	5164	goto exit;
4843	5165	}
..	..	@@ -4859,7 +5181,7 @@
4859	5181	&freq);
4860	5182	chan_nr = ieee80211_frequency_to_channel(freq);
4861	5183	af_params->channel = cpu_to_le32(chan_nr);
4862		-
	5184	+ af_params->dwell_time = cpu_to_le32(params->wait);
4863	5185	memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN],
4864	5186	le16_to_cpu(action_frame->len));
4865	5187
..	..	@@ -4888,6 +5210,7 @@
4888	5210	u64 cookie)
4889	5211	{
4890	5212	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5213	+ struct brcmf_pub *drvr = cfg->pub;
4891	5214	struct brcmf_cfg80211_vif *vif;
4892	5215	int err = 0;
4893	5216
..	..	@@ -4895,7 +5218,7 @@
4895	5218
4896	5219	vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
4897	5220	if (vif == NULL) {
4898		- brcmf_err("No p2p device available for probe response\n");
	5221	+ bphy_err(drvr, "No p2p device available for probe response\n");
4899	5222	err = -ENODEV;
4900	5223	goto exit;
4901	5224	}
..	..	@@ -4910,20 +5233,19 @@
4910	5233	{
4911	5234	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
4912	5235	struct net_device *ndev = wdev->netdev;
4913		- struct brcmf_if *ifp;
	5236	+ struct brcmf_pub *drvr = cfg->pub;
4914	5237	struct brcmu_chan ch;
4915	5238	enum nl80211_band band = 0;
4916	5239	enum nl80211_chan_width width = 0;
4917	5240	u32 chanspec;
4918	5241	int freq, err;
4919	5242
4920		- if (!ndev)
	5243	+ if (!ndev \|\| drvr->bus_if->state != BRCMF_BUS_UP)
4921	5244	return -ENODEV;
4922		- ifp = netdev_priv(ndev);
4923	5245
4924		- err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
	5246	+ err = brcmf_fil_iovar_int_get(netdev_priv(ndev), "chanspec", &chanspec);
4925	5247	if (err) {
4926		- brcmf_err("chanspec failed (%d)\n", err);
	5248	+ bphy_err(drvr, "chanspec failed (%d)\n", err);
4927	5249	return err;
4928	5250	}
4929	5251
..	..	@@ -5045,6 +5367,8 @@
5045	5367	struct net_device ndev, const u8 peer,
5046	5368	enum nl80211_tdls_operation oper)
5047	5369	{
	5370	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5371	+ struct brcmf_pub *drvr = cfg->pub;
5048	5372	struct brcmf_if *ifp;
5049	5373	struct brcmf_tdls_iovar_le info;
5050	5374	int ret = 0;
..	..	@@ -5062,7 +5386,7 @@
5062	5386	ret = brcmf_fil_iovar_data_set(ifp, "tdls_endpoint",
5063	5387	&info, sizeof(info));
5064	5388	if (ret < 0)
5065		- brcmf_err("tdls_endpoint iovar failed: ret=%d\n", ret);
	5389	+ bphy_err(drvr, "tdls_endpoint iovar failed: ret=%d\n", ret);
5066	5390
5067	5391	return ret;
5068	5392	}
..	..	@@ -5073,6 +5397,8 @@
5073	5397	struct cfg80211_connect_params *sme,
5074	5398	u32 changed)
5075	5399	{
	5400	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5401	+ struct brcmf_pub *drvr = cfg->pub;
5076	5402	struct brcmf_if *ifp;
5077	5403	int err;
5078	5404
..	..	@@ -5083,7 +5409,7 @@
5083	5409	err = brcmf_vif_set_mgmt_ie(ifp->vif, BRCMF_VNDR_IE_ASSOCREQ_FLAG,
5084	5410	sme->ie, sme->ie_len);
5085	5411	if (err)
5086		- brcmf_err("Set Assoc REQ IE Failed\n");
	5412	+ bphy_err(drvr, "Set Assoc REQ IE Failed\n");
5087	5413	else
5088	5414	brcmf_dbg(TRACE, "Applied Vndr IEs for Assoc request\n");
5089	5415
..	..	@@ -5095,6 +5421,8 @@
5095	5421	brcmf_cfg80211_set_rekey_data(struct wiphy wiphy, struct net_device ndev,
5096	5422	struct cfg80211_gtk_rekey_data *gtk)
5097	5423	{
	5424	+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	5425	+ struct brcmf_pub *drvr = cfg->pub;
5098	5426	struct brcmf_if *ifp = netdev_priv(ndev);
5099	5427	struct brcmf_gtk_keyinfo_le gtk_le;
5100	5428	int ret;
..	..	@@ -5109,7 +5437,7 @@
5109	5437	ret = brcmf_fil_iovar_data_set(ifp, "gtk_key_info", &gtk_le,
5110	5438	sizeof(gtk_le));
5111	5439	if (ret < 0)
5112		- brcmf_err("gtk_key_info iovar failed: ret=%d\n", ret);
	5440	+ bphy_err(drvr, "gtk_key_info iovar failed: ret=%d\n", ret);
5113	5441
5114	5442	return ret;
5115	5443	}
..	..	@@ -5178,7 +5506,8 @@
5178	5506	.change_station = brcmf_cfg80211_change_station,
5179	5507	.sched_scan_start = brcmf_cfg80211_sched_scan_start,
5180	5508	.sched_scan_stop = brcmf_cfg80211_sched_scan_stop,
5181		- .mgmt_frame_register = brcmf_cfg80211_mgmt_frame_register,
	5509	+ .update_mgmt_frame_registrations =
	5510	+ brcmf_cfg80211_update_mgmt_frame_registrations,
5182	5511	.mgmt_tx = brcmf_cfg80211_mgmt_tx,
5183	5512	.remain_on_channel = brcmf_p2p_remain_on_channel,
5184	5513	.cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
..	..	@@ -5212,6 +5541,7 @@
5212	5541	struct brcmf_cfg80211_vif *vif_walk;
5213	5542	struct brcmf_cfg80211_vif *vif;
5214	5543	bool mbss;
	5544	+ struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
5215	5545
5216	5546	brcmf_dbg(TRACE, "allocating virtual interface (size=%zu)\n",
5217	5547	sizeof(*vif));
..	..	@@ -5224,7 +5554,8 @@
5224	5554
5225	5555	brcmf_init_prof(&vif->profile);
5226	5556
5227		- if (type == NL80211_IFTYPE_AP) {
	5557	+ if (type == NL80211_IFTYPE_AP &&
	5558	+ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) {
5228	5559	mbss = false;
5229	5560	list_for_each_entry(vif_walk, &cfg->vif_list, list) {
5230	5561	if (vif_walk->wdev.iftype == NL80211_IFTYPE_AP) {
..	..	@@ -5263,14 +5594,16 @@
5263	5594	u32 event = e->event_code;
5264	5595	u32 status = e->status;
5265	5596
5266		- if (vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_PSK &&
	5597	+ if ((vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_PSK \|\|
	5598	+ vif->profile.use_fwsup == BRCMF_PROFILE_FWSUP_SAE) &&
5267	5599	event == BRCMF_E_PSK_SUP &&
5268	5600	status == BRCMF_E_STATUS_FWSUP_COMPLETED)
5269	5601	set_bit(BRCMF_VIF_STATUS_EAP_SUCCESS, &vif->sme_state);
5270	5602	if (event == BRCMF_E_SET_SSID && status == BRCMF_E_STATUS_SUCCESS) {
5271	5603	brcmf_dbg(CONN, "Processing set ssid\n");
5272	5604	memcpy(vif->profile.bssid, e->addr, ETH_ALEN);
5273		- if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_PSK)
	5605	+ if (vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_PSK &&
	5606	+ vif->profile.use_fwsup != BRCMF_PROFILE_FWSUP_SAE)
5274	5607	return true;
5275	5608
5276	5609	set_bit(BRCMF_VIF_STATUS_ASSOC_SUCCESS, &vif->sme_state);
..	..	@@ -5341,11 +5674,151 @@
5341	5674	conn_info->resp_ie_len = 0;
5342	5675	}
5343	5676
	5677	+u8 brcmf_map_prio_to_prec(void *config, u8 prio)
	5678	+{
	5679	+ struct brcmf_cfg80211_info cfg = (struct brcmf_cfg80211_info )config;
	5680	+
	5681	+ if (!cfg)
	5682	+ return (prio == PRIO_8021D_NONE \|\| prio == PRIO_8021D_BE) ?
	5683	+ (prio ^ 2) : prio;
	5684	+
	5685	+ /* For those AC(s) with ACM flag set to 1, convert its 4-level priority
	5686	+ * to an 8-level precedence which is the same as BE's
	5687	+ */
	5688	+ if (prio > PRIO_8021D_EE &&
	5689	+ cfg->ac_priority[prio] == cfg->ac_priority[PRIO_8021D_BE])
	5690	+ return cfg->ac_priority[prio] * 2;
	5691	+
	5692	+ /* Conversion of 4-level priority to 8-level precedence */
	5693	+ if (prio == PRIO_8021D_BE \|\| prio == PRIO_8021D_BK \|\|
	5694	+ prio == PRIO_8021D_CL \|\| prio == PRIO_8021D_VO)
	5695	+ return cfg->ac_priority[prio] * 2;
	5696	+ else
	5697	+ return cfg->ac_priority[prio] * 2 + 1;
	5698	+}
	5699	+
	5700	+u8 brcmf_map_prio_to_aci(void *config, u8 prio)
	5701	+{
	5702	+ /* Prio here refers to the 802.1d priority in range of 0 to 7.
	5703	+ * ACI here refers to the WLAN AC Index in range of 0 to 3.
	5704	+ * This function will return ACI corresponding to input prio.
	5705	+ */
	5706	+ struct brcmf_cfg80211_info cfg = (struct brcmf_cfg80211_info )config;
	5707	+
	5708	+ if (cfg)
	5709	+ return cfg->ac_priority[prio];
	5710	+
	5711	+ return prio;
	5712	+}
	5713	+
	5714	+static void brcmf_init_wmm_prio(u8 *priority)
	5715	+{
	5716	+ /* Initialize AC priority array to default
	5717	+ * 802.1d priority as per following table:
	5718	+ * 802.1d prio 0,3 maps to BE
	5719	+ * 802.1d prio 1,2 maps to BK
	5720	+ * 802.1d prio 4,5 maps to VI
	5721	+ * 802.1d prio 6,7 maps to VO
	5722	+ */
	5723	+ priority[0] = BRCMF_FWS_FIFO_AC_BE;
	5724	+ priority[3] = BRCMF_FWS_FIFO_AC_BE;
	5725	+ priority[1] = BRCMF_FWS_FIFO_AC_BK;
	5726	+ priority[2] = BRCMF_FWS_FIFO_AC_BK;
	5727	+ priority[4] = BRCMF_FWS_FIFO_AC_VI;
	5728	+ priority[5] = BRCMF_FWS_FIFO_AC_VI;
	5729	+ priority[6] = BRCMF_FWS_FIFO_AC_VO;
	5730	+ priority[7] = BRCMF_FWS_FIFO_AC_VO;
	5731	+}
	5732	+
	5733	+static void brcmf_wifi_prioritize_acparams(const
	5734	+ struct brcmf_cfg80211_edcf_acparam acp, u8 priority)
	5735	+{
	5736	+ u8 aci;
	5737	+ u8 aifsn;
	5738	+ u8 ecwmin;
	5739	+ u8 ecwmax;
	5740	+ u8 acm;
	5741	+ u8 ranking_basis[EDCF_AC_COUNT];
	5742	+ u8 aci_prio[EDCF_AC_COUNT]; /* AC_BE, AC_BK, AC_VI, AC_VO */
	5743	+ u8 index;
	5744	+
	5745	+ for (aci = 0; aci < EDCF_AC_COUNT; aci++, acp++) {
	5746	+ aifsn = acp->ACI & EDCF_AIFSN_MASK;
	5747	+ acm = (acp->ACI & EDCF_ACM_MASK) ? 1 : 0;
	5748	+ ecwmin = acp->ECW & EDCF_ECWMIN_MASK;
	5749	+ ecwmax = (acp->ECW & EDCF_ECWMAX_MASK) >> EDCF_ECWMAX_SHIFT;
	5750	+ brcmf_dbg(CONN, "ACI %d aifsn %d acm %d ecwmin %d ecwmax %d\n",
	5751	+ aci, aifsn, acm, ecwmin, ecwmax);
	5752	+ /* Default AC_VO will be the lowest ranking value */
	5753	+ ranking_basis[aci] = aifsn + ecwmin + ecwmax;
	5754	+ /* Initialise priority starting at 0 (AC_BE) */
	5755	+ aci_prio[aci] = 0;
	5756	+
	5757	+ /* If ACM is set, STA can't use this AC as per 802.11.
	5758	+ * Change the ranking to BE
	5759	+ */
	5760	+ if (aci != AC_BE && aci != AC_BK && acm == 1)
	5761	+ ranking_basis[aci] = ranking_basis[AC_BE];
	5762	+ }
	5763	+
	5764	+ /* Ranking method which works for AC priority
	5765	+ * swapping when values for cwmin, cwmax and aifsn are varied
	5766	+ * Compare each aci_prio against each other aci_prio
	5767	+ */
	5768	+ for (aci = 0; aci < EDCF_AC_COUNT; aci++) {
	5769	+ for (index = 0; index < EDCF_AC_COUNT; index++) {
	5770	+ if (index != aci) {
	5771	+ /* Smaller ranking value has higher priority,
	5772	+ * so increment priority for each ACI which has
	5773	+ * a higher ranking value
	5774	+ */
	5775	+ if (ranking_basis[aci] < ranking_basis[index])
	5776	+ aci_prio[aci]++;
	5777	+ }
	5778	+ }
	5779	+ }
	5780	+
	5781	+ /* By now, aci_prio[] will be in range of 0 to 3.
	5782	+ * Use ACI prio to get the new priority value for
	5783	+ * each 802.1d traffic type, in this range.
	5784	+ */
	5785	+ if (!(aci_prio[AC_BE] == aci_prio[AC_BK] &&
	5786	+ aci_prio[AC_BK] == aci_prio[AC_VI] &&
	5787	+ aci_prio[AC_VI] == aci_prio[AC_VO])) {
	5788	+ /* 802.1d 0,3 maps to BE */
	5789	+ priority[0] = aci_prio[AC_BE];
	5790	+ priority[3] = aci_prio[AC_BE];
	5791	+
	5792	+ /* 802.1d 1,2 maps to BK */
	5793	+ priority[1] = aci_prio[AC_BK];
	5794	+ priority[2] = aci_prio[AC_BK];
	5795	+
	5796	+ /* 802.1d 4,5 maps to VO */
	5797	+ priority[4] = aci_prio[AC_VI];
	5798	+ priority[5] = aci_prio[AC_VI];
	5799	+
	5800	+ /* 802.1d 6,7 maps to VO */
	5801	+ priority[6] = aci_prio[AC_VO];
	5802	+ priority[7] = aci_prio[AC_VO];
	5803	+ } else {
	5804	+ /* Initialize to default priority */
	5805	+ brcmf_init_wmm_prio(priority);
	5806	+ }
	5807	+
	5808	+ brcmf_dbg(CONN, "Adj prio BE 0->%d, BK 1->%d, BK 2->%d, BE 3->%d\n",
	5809	+ priority[0], priority[1], priority[2], priority[3]);
	5810	+
	5811	+ brcmf_dbg(CONN, "Adj prio VI 4->%d, VI 5->%d, VO 6->%d, VO 7->%d\n",
	5812	+ priority[4], priority[5], priority[6], priority[7]);
	5813	+}
	5814	+
5344	5815	static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
5345	5816	struct brcmf_if *ifp)
5346	5817	{
	5818	+ struct brcmf_pub *drvr = cfg->pub;
5347	5819	struct brcmf_cfg80211_assoc_ielen_le *assoc_info;
5348	5820	struct brcmf_cfg80211_connect_info *conn_info = cfg_to_conn(cfg);
	5821	+ struct brcmf_cfg80211_edcf_acparam edcf_acparam_info[EDCF_AC_COUNT];
5349	5822	u32 req_len;
5350	5823	u32 resp_len;
5351	5824	s32 err = 0;
..	..	@@ -5355,19 +5828,24 @@
5355	5828	err = brcmf_fil_iovar_data_get(ifp, "assoc_info",
5356	5829	cfg->extra_buf, WL_ASSOC_INFO_MAX);
5357	5830	if (err) {
5358		- brcmf_err("could not get assoc info (%d)\n", err);
	5831	+ bphy_err(drvr, "could not get assoc info (%d)\n", err);
5359	5832	return err;
5360	5833	}
5361	5834	assoc_info =
5362	5835	(struct brcmf_cfg80211_assoc_ielen_le *)cfg->extra_buf;
5363	5836	req_len = le32_to_cpu(assoc_info->req_len);
5364	5837	resp_len = le32_to_cpu(assoc_info->resp_len);
	5838	+ if (req_len > WL_EXTRA_BUF_MAX \|\| resp_len > WL_EXTRA_BUF_MAX) {
	5839	+ bphy_err(drvr, "invalid lengths in assoc info: req %u resp %u\n",
	5840	+ req_len, resp_len);
	5841	+ return -EINVAL;
	5842	+ }
5365	5843	if (req_len) {
5366	5844	err = brcmf_fil_iovar_data_get(ifp, "assoc_req_ies",
5367	5845	cfg->extra_buf,
5368	5846	WL_ASSOC_INFO_MAX);
5369	5847	if (err) {
5370		- brcmf_err("could not get assoc req (%d)\n", err);
	5848	+ bphy_err(drvr, "could not get assoc req (%d)\n", err);
5371	5849	return err;
5372	5850	}
5373	5851	conn_info->req_ie_len = req_len;
..	..	@@ -5385,7 +5863,7 @@
5385	5863	cfg->extra_buf,
5386	5864	WL_ASSOC_INFO_MAX);
5387	5865	if (err) {
5388		- brcmf_err("could not get assoc resp (%d)\n", err);
	5866	+ bphy_err(drvr, "could not get assoc resp (%d)\n", err);
5389	5867	return err;
5390	5868	}
5391	5869	conn_info->resp_ie_len = resp_len;
..	..	@@ -5394,6 +5872,17 @@
5394	5872	GFP_KERNEL);
5395	5873	if (!conn_info->resp_ie)
5396	5874	conn_info->resp_ie_len = 0;
	5875	+
	5876	+ err = brcmf_fil_iovar_data_get(ifp, "wme_ac_sta",
	5877	+ edcf_acparam_info,
	5878	+ sizeof(edcf_acparam_info));
	5879	+ if (err) {
	5880	+ brcmf_err("could not get wme_ac_sta (%d)\n", err);
	5881	+ return err;
	5882	+ }
	5883	+
	5884	+ brcmf_wifi_prioritize_acparams(edcf_acparam_info,
	5885	+ cfg->ac_priority);
5397	5886	} else {
5398	5887	conn_info->resp_ie_len = 0;
5399	5888	conn_info->resp_ie = NULL;
..	..	@@ -5467,6 +5956,11 @@
5467	5956	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
5468	5957	brcmf_dbg(CONN, "Report roaming result\n");
5469	5958
	5959	+ if (profile->use_fwsup == BRCMF_PROFILE_FWSUP_1X && profile->is_ft) {
	5960	+ cfg80211_port_authorized(ndev, profile->bssid, GFP_KERNEL);
	5961	+ brcmf_dbg(CONN, "Report port authorized\n");
	5962	+ }
	5963	+
5470	5964	set_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state);
5471	5965	brcmf_dbg(TRACE, "Exit\n");
5472	5966	return err;
..	..	@@ -5514,6 +6008,7 @@
5514	6008	struct net_device *ndev,
5515	6009	const struct brcmf_event_msg e, void data)
5516	6010	{
	6011	+ struct brcmf_pub *drvr = cfg->pub;
5517	6012	static int generation;
5518	6013	u32 event = e->event_code;
5519	6014	u32 reason = e->reason;
..	..	@@ -5531,7 +6026,7 @@
5531	6026	if (((event == BRCMF_E_ASSOC_IND) \|\| (event == BRCMF_E_REASSOC_IND)) &&
5532	6027	(reason == BRCMF_E_STATUS_SUCCESS)) {
5533	6028	if (!data) {
5534		- brcmf_err("No IEs present in ASSOC/REASSOC_IND");
	6029	+ bphy_err(drvr, "No IEs present in ASSOC/REASSOC_IND\n");
5535	6030	return -EINVAL;
5536	6031	}
5537	6032
..	..	@@ -5589,10 +6084,19 @@
5589	6084	brcmf_net_setcarrier(ifp, true);
5590	6085	} else if (brcmf_is_linkdown(ifp->vif, e)) {
5591	6086	brcmf_dbg(CONN, "Linkdown\n");
5592		- if (!brcmf_is_ibssmode(ifp->vif)) {
	6087	+ if (!brcmf_is_ibssmode(ifp->vif) &&
	6088	+ test_bit(BRCMF_VIF_STATUS_CONNECTED,
	6089	+ &ifp->vif->sme_state)) {
	6090	+ if (memcmp(profile->bssid, e->addr, ETH_ALEN))
	6091	+ return err;
	6092	+
5593	6093	brcmf_bss_connect_done(cfg, ndev, e, false);
5594	6094	brcmf_link_down(ifp->vif,
5595		- brcmf_map_fw_linkdown_reason(e));
	6095	+ brcmf_map_fw_linkdown_reason(e),
	6096	+ e->event_code &
	6097	+ (BRCMF_E_DEAUTH_IND \|
	6098	+ BRCMF_E_DISASSOC_IND)
	6099	+ ? false : true);
5596	6100	brcmf_init_prof(ndev_to_prof(ndev));
5597	6101	if (ndev != cfg_to_ndev(cfg))
5598	6102	complete(&cfg->vif_disabled);
..	..	@@ -5804,6 +6308,7 @@
5804	6308	mutex_init(&cfg->usr_sync);
5805	6309	brcmf_init_escan(cfg);
5806	6310	brcmf_init_conf(cfg->conf);
	6311	+ brcmf_init_wmm_prio(cfg->ac_priority);
5807	6312	init_completion(&cfg->vif_disabled);
5808	6313	return err;
5809	6314	}
..	..	@@ -5823,6 +6328,7 @@
5823	6328
5824	6329	static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
5825	6330	{
	6331	+ struct brcmf_pub *drvr = ifp->drvr;
5826	6332	s32 err;
5827	6333	u32 bcn_timeout;
5828	6334	__le32 roamtrigger[2];
..	..	@@ -5835,7 +6341,7 @@
5835	6341	bcn_timeout = BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON;
5836	6342	err = brcmf_fil_iovar_int_set(ifp, "bcn_timeout", bcn_timeout);
5837	6343	if (err) {
5838		- brcmf_err("bcn_timeout error (%d)\n", err);
	6344	+ bphy_err(drvr, "bcn_timeout error (%d)\n", err);
5839	6345	goto roam_setup_done;
5840	6346	}
5841	6347
..	..	@@ -5847,7 +6353,7 @@
5847	6353	err = brcmf_fil_iovar_int_set(ifp, "roam_off",
5848	6354	ifp->drvr->settings->roamoff);
5849	6355	if (err) {
5850		- brcmf_err("roam_off error (%d)\n", err);
	6356	+ bphy_err(drvr, "roam_off error (%d)\n", err);
5851	6357	goto roam_setup_done;
5852	6358	}
5853	6359
..	..	@@ -5855,19 +6361,17 @@
5855	6361	roamtrigger[1] = cpu_to_le32(BRCM_BAND_ALL);
5856	6362	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_TRIGGER,
5857	6363	(void *)roamtrigger, sizeof(roamtrigger));
5858		- if (err) {
5859		- brcmf_err("WLC_SET_ROAM_TRIGGER error (%d)\n", err);
5860		- goto roam_setup_done;
5861		- }
	6364	+ if (err)
	6365	+ bphy_err(drvr, "WLC_SET_ROAM_TRIGGER error (%d)\n", err);
5862	6366
5863	6367	roam_delta[0] = cpu_to_le32(WL_ROAM_DELTA);
5864	6368	roam_delta[1] = cpu_to_le32(BRCM_BAND_ALL);
5865	6369	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_ROAM_DELTA,
5866	6370	(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		- }
	6371	+ if (err)
	6372	+ bphy_err(drvr, "WLC_SET_ROAM_DELTA error (%d)\n", err);
	6373	+
	6374	+ return 0;
5871	6375
5872	6376	roam_setup_done:
5873	6377	return err;
..	..	@@ -5876,25 +6380,26 @@
5876	6380	static s32
5877	6381	brcmf_dongle_scantime(struct brcmf_if *ifp)
5878	6382	{
	6383	+ struct brcmf_pub *drvr = ifp->drvr;
5879	6384	s32 err = 0;
5880	6385
5881	6386	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
5882	6387	BRCMF_SCAN_CHANNEL_TIME);
5883	6388	if (err) {
5884		- brcmf_err("Scan assoc time error (%d)\n", err);
	6389	+ bphy_err(drvr, "Scan assoc time error (%d)\n", err);
5885	6390	goto dongle_scantime_out;
5886	6391	}
5887	6392	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
5888	6393	BRCMF_SCAN_UNASSOC_TIME);
5889	6394	if (err) {
5890		- brcmf_err("Scan unassoc time error (%d)\n", err);
	6395	+ bphy_err(drvr, "Scan unassoc time error (%d)\n", err);
5891	6396	goto dongle_scantime_out;
5892	6397	}
5893	6398
5894	6399	err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_PASSIVE_TIME,
5895	6400	BRCMF_SCAN_PASSIVE_TIME);
5896	6401	if (err) {
5897		- brcmf_err("Scan passive time error (%d)\n", err);
	6402	+ bphy_err(drvr, "Scan passive time error (%d)\n", err);
5898	6403	goto dongle_scantime_out;
5899	6404	}
5900	6405
..	..	@@ -5926,10 +6431,11 @@
5926	6431	static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg,
5927	6432	u32 bw_cap[])
5928	6433	{
5929		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	6434	+ struct wiphy *wiphy = cfg_to_wiphy(cfg);
	6435	+ struct brcmf_pub *drvr = cfg->pub;
	6436	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
5930	6437	struct ieee80211_supported_band *band;
5931	6438	struct ieee80211_channel *channel;
5932		- struct wiphy *wiphy;
5933	6439	struct brcmf_chanspec_list *list;
5934	6440	struct brcmu_chan ch;
5935	6441	int err;
..	..	@@ -5948,11 +6454,10 @@
5948	6454	err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
5949	6455	BRCMF_DCMD_MEDLEN);
5950	6456	if (err) {
5951		- brcmf_err("get chanspecs error (%d)\n", err);
	6457	+ bphy_err(drvr, "get chanspecs error (%d)\n", err);
5952	6458	goto fail_pbuf;
5953	6459	}
5954	6460
5955		- wiphy = cfg_to_wiphy(cfg);
5956	6461	band = wiphy->bands[NL80211_BAND_2GHZ];
5957	6462	if (band)
5958	6463	for (i = 0; i < band->n_channels; i++)
..	..	@@ -5963,6 +6468,13 @@
5963	6468	band->channels[i].flags = IEEE80211_CHAN_DISABLED;
5964	6469
5965	6470	total = le32_to_cpu(list->count);
	6471	+ if (total > BRCMF_MAX_CHANSPEC_LIST) {
	6472	+ bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",
	6473	+ total);
	6474	+ err = -EINVAL;
	6475	+ goto fail_pbuf;
	6476	+ }
	6477	+
5966	6478	for (i = 0; i < total; i++) {
5967	6479	ch.chspec = (u16)le32_to_cpu(list->element[i]);
5968	6480	cfg->d11inf.decchspec(&ch);
..	..	@@ -5972,7 +6484,8 @@
5972	6484	} else if (ch.band == BRCMU_CHAN_BAND_5G) {
5973	6485	band = wiphy->bands[NL80211_BAND_5GHZ];
5974	6486	} else {
5975		- brcmf_err("Invalid channel Spec. 0x%x.\n", ch.chspec);
	6487	+ bphy_err(drvr, "Invalid channel Spec. 0x%x.\n",
	6488	+ ch.chspec);
5976	6489	continue;
5977	6490	}
5978	6491	if (!band)
..	..	@@ -5995,8 +6508,8 @@
5995	6508	/* It seems firmware supports some channel we never
5996	6509	* considered. Something new in IEEE standard?
5997	6510	*/
5998		- brcmf_err("Ignoring unexpected firmware channel %d\n",
5999		- ch.control_ch_num);
	6511	+ bphy_err(drvr, "Ignoring unexpected firmware channel %d\n",
	6512	+ ch.control_ch_num);
6000	6513	continue;
6001	6514	}
6002	6515
..	..	@@ -6006,11 +6519,21 @@
6006	6519	/* assuming the chanspecs order is HT20,
6007	6520	* HT40 upper, HT40 lower, and VHT80.
6008	6521	*/
6009		- if (ch.bw == BRCMU_CHAN_BW_80) {
	6522	+ switch (ch.bw) {
	6523	+ case BRCMU_CHAN_BW_160:
	6524	+ channel->flags &= ~IEEE80211_CHAN_NO_160MHZ;
	6525	+ break;
	6526	+ case BRCMU_CHAN_BW_80:
6010	6527	channel->flags &= ~IEEE80211_CHAN_NO_80MHZ;
6011		- } else if (ch.bw == BRCMU_CHAN_BW_40) {
	6528	+ break;
	6529	+ case BRCMU_CHAN_BW_40:
6012	6530	brcmf_update_bw40_channel_flag(channel, &ch);
6013		- } else {
	6531	+ break;
	6532	+ default:
	6533	+ wiphy_warn(wiphy, "Firmware reported unsupported bandwidth %d\n",
	6534	+ ch.bw);
	6535	+ fallthrough;
	6536	+ case BRCMU_CHAN_BW_20:
6014	6537	/* enable the channel and disable other bandwidths
6015	6538	* for now as mentioned order assure they are enabled
6016	6539	* for subsequent chanspecs.
..	..	@@ -6042,7 +6565,8 @@
6042	6565
6043	6566	static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg)
6044	6567	{
6045		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	6568	+ struct brcmf_pub *drvr = cfg->pub;
	6569	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
6046	6570	struct ieee80211_supported_band *band;
6047	6571	struct brcmf_fil_bwcap_le band_bwcap;
6048	6572	struct brcmf_chanspec_list *list;
..	..	@@ -6088,7 +6612,7 @@
6088	6612	err = brcmf_fil_iovar_data_get(ifp, "chanspecs", pbuf,
6089	6613	BRCMF_DCMD_MEDLEN);
6090	6614	if (err) {
6091		- brcmf_err("get chanspecs error (%d)\n", err);
	6615	+ bphy_err(drvr, "get chanspecs error (%d)\n", err);
6092	6616	kfree(pbuf);
6093	6617	return err;
6094	6618	}
..	..	@@ -6096,6 +6620,13 @@
6096	6620	band = cfg_to_wiphy(cfg)->bands[NL80211_BAND_2GHZ];
6097	6621	list = (struct brcmf_chanspec_list *)pbuf;
6098	6622	num_chan = le32_to_cpu(list->count);
	6623	+ if (num_chan > BRCMF_MAX_CHANSPEC_LIST) {
	6624	+ bphy_err(drvr, "Invalid count of channel Spec. (%u)\n",
	6625	+ num_chan);
	6626	+ kfree(pbuf);
	6627	+ return -EINVAL;
	6628	+ }
	6629	+
6099	6630	for (i = 0; i < num_chan; i++) {
6100	6631	ch.chspec = (u16)le32_to_cpu(list->element[i]);
6101	6632	cfg->d11inf.decchspec(&ch);
..	..	@@ -6119,6 +6650,7 @@
6119	6650
6120	6651	static void brcmf_get_bwcap(struct brcmf_if *ifp, u32 bw_cap[])
6121	6652	{
	6653	+ struct brcmf_pub *drvr = ifp->drvr;
6122	6654	u32 band, mimo_bwcap;
6123	6655	int err;
6124	6656
..	..	@@ -6145,16 +6677,16 @@
6145	6677	switch (mimo_bwcap) {
6146	6678	case WLC_N_BW_40ALL:
6147	6679	bw_cap[NL80211_BAND_2GHZ] \|= WLC_BW_40MHZ_BIT;
6148		- /* fall-thru */
	6680	+ fallthrough;
6149	6681	case WLC_N_BW_20IN2G_40IN5G:
6150	6682	bw_cap[NL80211_BAND_5GHZ] \|= WLC_BW_40MHZ_BIT;
6151		- /* fall-thru */
	6683	+ fallthrough;
6152	6684	case WLC_N_BW_20ALL:
6153	6685	bw_cap[NL80211_BAND_2GHZ] \|= WLC_BW_20MHZ_BIT;
6154	6686	bw_cap[NL80211_BAND_5GHZ] \|= WLC_BW_20MHZ_BIT;
6155	6687	break;
6156	6688	default:
6157		- brcmf_err("invalid mimo_bw_cap value\n");
	6689	+ bphy_err(drvr, "invalid mimo_bw_cap value\n");
6158	6690	}
6159	6691	}
6160	6692
..	..	@@ -6229,8 +6761,9 @@
6229	6761
6230	6762	static int brcmf_setup_wiphybands(struct brcmf_cfg80211_info *cfg)
6231	6763	{
6232		- struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
6233		- struct wiphy *wiphy;
	6764	+ struct brcmf_pub *drvr = cfg->pub;
	6765	+ struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
	6766	+ struct wiphy *wiphy = cfg_to_wiphy(cfg);
6234	6767	u32 nmode = 0;
6235	6768	u32 vhtmode = 0;
6236	6769	u32 bw_cap[2] = { WLC_BW_20MHZ_BIT, WLC_BW_20MHZ_BIT };
..	..	@@ -6246,7 +6779,7 @@
6246	6779	(void)brcmf_fil_iovar_int_get(ifp, "vhtmode", &vhtmode);
6247	6780	err = brcmf_fil_iovar_int_get(ifp, "nmode", &nmode);
6248	6781	if (err) {
6249		- brcmf_err("nmode error (%d)\n", err);
	6782	+ bphy_err(drvr, "nmode error (%d)\n", err);
6250	6783	} else {
6251	6784	brcmf_get_bwcap(ifp, bw_cap);
6252	6785	}
..	..	@@ -6256,7 +6789,7 @@
6256	6789
6257	6790	err = brcmf_fil_iovar_int_get(ifp, "rxchain", &rxchain);
6258	6791	if (err) {
6259		- brcmf_err("rxchain error (%d)\n", err);
	6792	+ bphy_err(drvr, "rxchain error (%d)\n", err);
6260	6793	nchain = 1;
6261	6794	} else {
6262	6795	for (nchain = 0; rxchain; nchain++)
..	..	@@ -6266,7 +6799,7 @@
6266	6799
6267	6800	err = brcmf_construct_chaninfo(cfg, bw_cap);
6268	6801	if (err) {
6269		- brcmf_err("brcmf_construct_chaninfo failed (%d)\n", err);
	6802	+ bphy_err(drvr, "brcmf_construct_chaninfo failed (%d)\n", err);
6270	6803	return err;
6271	6804	}
6272	6805
..	..	@@ -6278,7 +6811,6 @@
6278	6811	&txbf_bfr_cap);
6279	6812	}
6280	6813
6281		- wiphy = cfg_to_wiphy(cfg);
6282	6814	for (i = 0; i < ARRAY_SIZE(wiphy->bands); i++) {
6283	6815	band = wiphy->bands[i];
6284	6816	if (band == NULL)
..	..	@@ -6351,6 +6883,9 @@
6351	6883	* #STA <= 1, #AP <= 1, channels = 1, 2 total
6352	6884	* #AP <= 4, matching BI, channels = 1, 4 total
6353	6885	*
	6886	+ * no p2p and rsdb:
	6887	+ * #STA <= 1, #AP <= 2, channels = 2, 4 total
	6888	+ *
6354	6889	* p2p, no mchan, and mbss:
6355	6890	*
6356	6891	* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 1, 3 total
..	..	@@ -6362,6 +6897,10 @@
6362	6897	* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 2, 3 total
6363	6898	* #STA <= 1, #P2P-DEV <= 1, #AP <= 1, #P2P-CL <= 1, channels = 1, 4 total
6364	6899	* #AP <= 4, matching BI, channels = 1, 4 total
	6900	+ *
	6901	+ * p2p, rsdb, and no mbss:
	6902	+ * #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 2, AP <= 2,
	6903	+ * channels = 2, 4 total
6365	6904	*/
6366	6905	static int brcmf_setup_ifmodes(struct wiphy wiphy, struct brcmf_if ifp)
6367	6906	{
..	..	@@ -6369,13 +6908,16 @@
6369	6908	struct ieee80211_iface_limit *c0_limits = NULL;
6370	6909	struct ieee80211_iface_limit *p2p_limits = NULL;
6371	6910	struct ieee80211_iface_limit *mbss_limits = NULL;
6372		- bool mbss, p2p;
6373		- int i, c, n_combos;
	6911	+ bool mon_flag, mbss, p2p, rsdb, mchan;
	6912	+ int i, c, n_combos, n_limits;
6374	6913
	6914	+ mon_flag = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MONITOR_FLAG);
6375	6915	mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS);
6376	6916	p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P);
	6917	+ rsdb = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_RSDB);
	6918	+ mchan = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN);
6377	6919
6378		- n_combos = 1 + !!p2p + !!mbss;
	6920	+ n_combos = 1 + !!(p2p && !rsdb) + !!mbss;
6379	6921	combo = kcalloc(n_combos, sizeof(*combo), GFP_KERNEL);
6380	6922	if (!combo)
6381	6923	goto err;
..	..	@@ -6383,37 +6925,53 @@
6383	6925	wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
6384	6926	BIT(NL80211_IFTYPE_ADHOC) \|
6385	6927	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;
	6928	+ if (mon_flag)
	6929	+ wiphy->interface_modes \|= BIT(NL80211_IFTYPE_MONITOR);
	6930	+ if (p2p)
6399	6931	wiphy->interface_modes \|= BIT(NL80211_IFTYPE_P2P_CLIENT) \|
6400	6932	BIT(NL80211_IFTYPE_P2P_GO) \|
6401	6933	BIT(NL80211_IFTYPE_P2P_DEVICE);
	6934	+
	6935	+ c = 0;
	6936	+ i = 0;
	6937	+ n_limits = 1 + mon_flag + (p2p ? 2 : 0) + (rsdb \|\| !p2p);
	6938	+ c0_limits = kcalloc(n_limits, sizeof(*c0_limits), GFP_KERNEL);
	6939	+ if (!c0_limits)
	6940	+ goto err;
	6941	+
	6942	+ combo[c].num_different_channels = 1 + (rsdb \|\| (p2p && mchan));
	6943	+ c0_limits[i].max = 1;
	6944	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
	6945	+ if (mon_flag) {
	6946	+ c0_limits[i].max = 1;
	6947	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);
	6948	+ }
	6949	+ if (p2p) {
6402	6950	c0_limits[i].max = 1;
6403	6951	c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
6404		- c0_limits[i].max = 1;
	6952	+ c0_limits[i].max = 1 + rsdb;
6405	6953	c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) \|
6406	6954	BIT(NL80211_IFTYPE_P2P_GO);
	6955	+ }
	6956	+ if (p2p && rsdb) {
	6957	+ c0_limits[i].max = 2;
	6958	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6959	+ combo[c].max_interfaces = 4;
	6960	+ } else if (p2p) {
	6961	+ combo[c].max_interfaces = i;
	6962	+ } else if (rsdb) {
	6963	+ c0_limits[i].max = 2;
	6964	+ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6965	+ combo[c].max_interfaces = 3;
6407	6966	} else {
6408		- combo[c].num_different_channels = 1;
6409	6967	c0_limits[i].max = 1;
6410	6968	c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	6969	+ combo[c].max_interfaces = i;
6411	6970	}
6412		- combo[c].max_interfaces = i;
6413	6971	combo[c].n_limits = i;
6414	6972	combo[c].limits = c0_limits;
6415	6973
6416		- if (p2p) {
	6974	+ if (p2p && !rsdb) {
6417	6975	c++;
6418	6976	i = 0;
6419	6977	p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
..	..	@@ -6436,14 +6994,20 @@
6436	6994	if (mbss) {
6437	6995	c++;
6438	6996	i = 0;
6439		- mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
	6997	+ n_limits = 1 + mon_flag;
	6998	+ mbss_limits = kcalloc(n_limits, sizeof(*mbss_limits),
	6999	+ GFP_KERNEL);
6440	7000	if (!mbss_limits)
6441	7001	goto err;
6442	7002	mbss_limits[i].max = 4;
6443	7003	mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);
	7004	+ if (mon_flag) {
	7005	+ mbss_limits[i].max = 1;
	7006	+ mbss_limits[i++].types = BIT(NL80211_IFTYPE_MONITOR);
	7007	+ }
6444	7008	combo[c].beacon_int_infra_match = true;
6445	7009	combo[c].num_different_channels = 1;
6446		- combo[c].max_interfaces = 4;
	7010	+ combo[c].max_interfaces = 4 + mon_flag;
6447	7011	combo[c].n_limits = i;
6448	7012	combo[c].limits = mbss_limits;
6449	7013	}
..	..	@@ -6474,12 +7038,13 @@
6474	7038	{
6475	7039	#ifdef CONFIG_PM
6476	7040	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
	7041	+ struct brcmf_pub *drvr = cfg->pub;
6477	7042	struct wiphy_wowlan_support *wowl;
6478	7043
6479	7044	wowl = kmemdup(&brcmf_wowlan_support, sizeof(brcmf_wowlan_support),
6480	7045	GFP_KERNEL);
6481	7046	if (!wowl) {
6482		- brcmf_err("only support basic wowlan features\n");
	7047	+ bphy_err(drvr, "only support basic wowlan features\n");
6483	7048	wiphy->wowlan = &brcmf_wowlan_support;
6484	7049	return;
6485	7050	}
..	..	@@ -6560,6 +7125,16 @@
6560	7125	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK);
6561	7126	wiphy_ext_feature_set(wiphy,
6562	7127	NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X);
	7128	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SAE))
	7129	+ wiphy_ext_feature_set(wiphy,
	7130	+ NL80211_EXT_FEATURE_SAE_OFFLOAD);
	7131	+ }
	7132	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_FWAUTH)) {
	7133	+ wiphy_ext_feature_set(wiphy,
	7134	+ NL80211_EXT_FEATURE_4WAY_HANDSHAKE_AP_PSK);
	7135	+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SAE))
	7136	+ wiphy_ext_feature_set(wiphy,
	7137	+ NL80211_EXT_FEATURE_SAE_OFFLOAD_AP);
6563	7138	}
6564	7139	wiphy->mgmt_stypes = brcmf_txrx_stypes;
6565	7140	wiphy->max_remain_on_channel_duration = 5000;
..	..	@@ -6576,7 +7151,7 @@
6576	7151	err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST, &bandlist,
6577	7152	sizeof(bandlist));
6578	7153	if (err) {
6579		- brcmf_err("could not obtain band info: err=%d\n", err);
	7154	+ bphy_err(drvr, "could not obtain band info: err=%d\n", err);
6580	7155	return err;
6581	7156	}
6582	7157	/* first entry in bandlist is number of bands */
..	..	@@ -6618,6 +7193,11 @@
6618	7193	}
6619	7194	}
6620	7195
	7196	+ if (wiphy->bands[NL80211_BAND_5GHZ] &&
	7197	+ brcmf_feat_is_enabled(ifp, BRCMF_FEAT_DOT11H))
	7198	+ wiphy_ext_feature_set(wiphy,
	7199	+ NL80211_EXT_FEATURE_DFS_OFFLOAD);
	7200	+
6621	7201	wiphy_read_of_freq_limits(wiphy);
6622	7202
6623	7203	return 0;
..	..	@@ -6625,6 +7205,7 @@
6625	7205
6626	7206	static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg)
6627	7207	{
	7208	+ struct brcmf_pub *drvr = cfg->pub;
6628	7209	struct net_device *ndev;
6629	7210	struct wireless_dev *wdev;
6630	7211	struct brcmf_if *ifp;
..	..	@@ -6660,6 +7241,12 @@
6660	7241
6661	7242	brcmf_configure_arp_nd_offload(ifp, true);
6662	7243
	7244	+ err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_FAKEFRAG, 1);
	7245	+ if (err) {
	7246	+ bphy_err(drvr, "failed to set frameburst mode\n");
	7247	+ goto default_conf_out;
	7248	+ }
	7249	+
6663	7250	cfg->dongle_up = true;
6664	7251	default_conf_out:
6665	7252
..	..	@@ -6683,7 +7270,7 @@
6683	7270	* from AP to save power
6684	7271	*/
6685	7272	if (check_vif_up(ifp->vif)) {
6686		- brcmf_link_down(ifp->vif, WLAN_REASON_UNSPECIFIED);
	7273	+ brcmf_link_down(ifp->vif, WLAN_REASON_UNSPECIFIED, true);
6687	7274
6688	7275	/* Make sure WPA_Supplicant receives all the event
6689	7276	generated due to DISASSOC call to the fw to keep
..	..	@@ -6837,6 +7424,7 @@
6837	7424	{
6838	7425	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
6839	7426	struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
	7427	+ struct brcmf_pub *drvr = cfg->pub;
6840	7428	struct brcmf_fil_country_le ccreq;
6841	7429	s32 err;
6842	7430	int i;
..	..	@@ -6848,8 +7436,8 @@
6848	7436	/* ignore non-ISO3166 country codes */
6849	7437	for (i = 0; i < 2; i++)
6850	7438	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]);
	7439	+ bphy_err(drvr, "not an ISO3166 code (0x%02x 0x%02x)\n",
	7440	+ req->alpha2[0], req->alpha2[1]);
6853	7441	return;
6854	7442	}
6855	7443
..	..	@@ -6858,7 +7446,7 @@
6858	7446
6859	7447	err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
6860	7448	if (err) {
6861		- brcmf_err("Country code iovar returned err = %d\n", err);
	7449	+ bphy_err(drvr, "Country code iovar returned err = %d\n", err);
6862	7450	return;
6863	7451	}
6864	7452
..	..	@@ -6868,7 +7456,7 @@
6868	7456
6869	7457	err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
6870	7458	if (err) {
6871		- brcmf_err("Firmware rejected country setting\n");
	7459	+ bphy_err(drvr, "Firmware rejected country setting\n");
6872	7460	return;
6873	7461	}
6874	7462	brcmf_setup_wiphybands(cfg);
..	..	@@ -6914,13 +7502,13 @@
6914	7502	u16 *cap = NULL;
6915	7503
6916	7504	if (!ndev) {
6917		- brcmf_err("ndev is invalid\n");
	7505	+ bphy_err(drvr, "ndev is invalid\n");
6918	7506	return NULL;
6919	7507	}
6920	7508
6921	7509	cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);
6922	7510	if (!cfg) {
6923		- brcmf_err("Could not allocate wiphy device\n");
	7511	+ bphy_err(drvr, "Could not allocate wiphy device\n");
6924	7512	return NULL;
6925	7513	}
6926	7514
..	..	@@ -6941,7 +7529,7 @@
6941	7529
6942	7530	err = wl_init_priv(cfg);
6943	7531	if (err) {
6944		- brcmf_err("Failed to init iwm_priv (%d)\n", err);
	7532	+ bphy_err(drvr, "Failed to init iwm_priv (%d)\n", err);
6945	7533	brcmf_free_vif(vif);
6946	7534	goto wiphy_out;
6947	7535	}
..	..	@@ -6950,7 +7538,7 @@
6950	7538	/* determine d11 io type before wiphy setup */
6951	7539	err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION, &io_type);
6952	7540	if (err) {
6953		- brcmf_err("Failed to get D11 version (%d)\n", err);
	7541	+ bphy_err(drvr, "Failed to get D11 version (%d)\n", err);
6954	7542	goto priv_out;
6955	7543	}
6956	7544	cfg->d11inf.io_type = (u8)io_type;
..	..	@@ -6984,13 +7572,13 @@
6984	7572	#endif
6985	7573	err = wiphy_register(wiphy);
6986	7574	if (err < 0) {
6987		- brcmf_err("Could not register wiphy device (%d)\n", err);
	7575	+ bphy_err(drvr, "Could not register wiphy device (%d)\n", err);
6988	7576	goto priv_out;
6989	7577	}
6990	7578
6991	7579	err = brcmf_setup_wiphybands(cfg);
6992	7580	if (err) {
6993		- brcmf_err("Setting wiphy bands failed (%d)\n", err);
	7581	+ bphy_err(drvr, "Setting wiphy bands failed (%d)\n", err);
6994	7582	goto wiphy_unreg_out;
6995	7583	}
6996	7584
..	..	@@ -7008,24 +7596,24 @@
7008	7596
7009	7597	err = brcmf_fweh_activate_events(ifp);
7010	7598	if (err) {
7011		- brcmf_err("FWEH activation failed (%d)\n", err);
	7599	+ bphy_err(drvr, "FWEH activation failed (%d)\n", err);
7012	7600	goto wiphy_unreg_out;
7013	7601	}
7014	7602
7015	7603	err = brcmf_p2p_attach(cfg, p2pdev_forced);
7016	7604	if (err) {
7017		- brcmf_err("P2P initialisation failed (%d)\n", err);
	7605	+ bphy_err(drvr, "P2P initialisation failed (%d)\n", err);
7018	7606	goto wiphy_unreg_out;
7019	7607	}
7020	7608	err = brcmf_btcoex_attach(cfg);
7021	7609	if (err) {
7022		- brcmf_err("BT-coex initialisation failed (%d)\n", err);
	7610	+ bphy_err(drvr, "BT-coex initialisation failed (%d)\n", err);
7023	7611	brcmf_p2p_detach(&cfg->p2p);
7024	7612	goto wiphy_unreg_out;
7025	7613	}
7026	7614	err = brcmf_pno_attach(cfg);
7027	7615	if (err) {
7028		- brcmf_err("PNO initialisation failed (%d)\n", err);
	7616	+ bphy_err(drvr, "PNO initialisation failed (%d)\n", err);
7029	7617	brcmf_btcoex_detach(cfg);
7030	7618	brcmf_p2p_detach(&cfg->p2p);
7031	7619	goto wiphy_unreg_out;
..	..	@@ -7045,7 +7633,7 @@
7045	7633	/* (re-) activate FWEH event handling */
7046	7634	err = brcmf_fweh_activate_events(ifp);
7047	7635	if (err) {
7048		- brcmf_err("FWEH activation failed (%d)\n", err);
	7636	+ bphy_err(drvr, "FWEH activation failed (%d)\n", err);
7049	7637	goto detach;
7050	7638	}
7051	7639
..	..	@@ -7085,7 +7673,6 @@
7085	7673	brcmf_pno_detach(cfg);
7086	7674	brcmf_btcoex_detach(cfg);
7087	7675	wiphy_unregister(cfg->wiphy);
7088		- kfree(cfg->ops);
7089	7676	wl_deinit_priv(cfg);
7090	7677	brcmf_free_wiphy(cfg->wiphy);
7091	7678	kfree(cfg);