~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,10 +1,10 @@
1	1	/*
2		- * Marvell Wireless LAN device driver: major data structures and prototypes
	2	+ * NXP Wireless LAN device driver: major data structures and prototypes
3	3	*
4		- * Copyright (C) 2011-2014, Marvell International Ltd.
	4	+ * Copyright 2011-2020 NXP
5	5	*
6		- * This software file (the "File") is distributed by Marvell International
7		- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
	6	+ * This software file (the "File") is distributed by NXP
	7	+ * under the terms of the GNU General Public License Version 2, June 1991
8	8	* (the "License"). You may use, redistribute and/or modify this File in
9	9	* accordance with the terms and conditions of the License, a copy of which
10	10	* is available by writing to the Free Software Foundation, Inc.,
..	..	@@ -748,7 +748,7 @@
748	748	struct cmd_ctrl_node {
749	749	struct list_head list;
750	750	struct mwifiex_private *priv;
751		- u32 cmd_oid;
	751	+ u32 cmd_no;
752	752	u32 cmd_flag;
753	753	struct sk_buff *cmd_skb;
754	754	struct sk_buff *resp_skb;
..	..	@@ -1017,10 +1017,12 @@
1017	1017
1018	1018	/* For synchronizing FW initialization with device lifecycle. */
1019	1019	struct completion *fw_done;
	1020	+ bool is_up;
1020	1021
1021	1022	bool ext_scan;
1022	1023	u8 fw_api_ver;
1023	1024	u8 key_api_major_ver, key_api_minor_ver;
	1025	+ u8 max_p2p_conn, max_sta_conn;
1024	1026	struct memory_type_mapping *mem_type_mapping_tbl;
1025	1027	u8 num_mem_types;
1026	1028	bool scan_chan_gap_enabled;
..	..	@@ -1052,6 +1054,8 @@
1052	1054	void *devdump_data;
1053	1055	int devdump_len;
1054	1056	struct timer_list devdump_timer;
	1057	+
	1058	+ bool ignore_btcoex_events;
1055	1059	};
1056	1060
1057	1061	void mwifiex_process_tx_queue(struct mwifiex_adapter *adapter);