~hc/RK356X_SDK_RELEASE.git

..	..	@@ -7,6 +7,7 @@
7	7	*
8	8	* Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
9	9	* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	10	+ * Copyright (C) 2018-2019 Intel Corporation
10	11	*
11	12	* This program is free software; you can redistribute it and/or modify
12	13	* it under the terms of version 2 of the GNU General Public License as
..	..	@@ -16,11 +17,6 @@
16	17	* WITHOUT ANY WARRANTY; without even the implied warranty of
17	18	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18	19	* General Public License for more details.
19		- *
20		- * You should have received a copy of the GNU General Public License
21		- * along with this program; if not, write to the Free Software
22		- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
23		- * USA
24	20	*
25	21	* The full GNU General Public License is included in this distribution
26	22	* in the file called COPYING.
..	..	@@ -33,6 +29,7 @@
33	29	*
34	30	* Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
35	31	* Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
	32	+ * Copyright (C) 2018-2019 Intel Corporation
36	33	* All rights reserved.
37	34	*
38	35	* Redistribution and use in source and binary forms, with or without
..	..	@@ -69,7 +66,7 @@
69	66	struct ieee80211_vif *ignore_vif;
70	67	u8 sta_vif_ap_sta_id;
71	68	enum iwl_sf_state sta_vif_state;
72		- int num_active_macs;
	69	+ u32 num_active_macs;
73	70	};
74	71
75	72	/*
..	..	@@ -165,7 +162,9 @@
165	162	* capabilities of the AP station, and choose the watermark accordingly.
166	163	*/
167	164	if (sta) {
168		- if (sta->ht_cap.ht_supported \|\| sta->vht_cap.vht_supported) {
	165	+ if (sta->ht_cap.ht_supported \|\|
	166	+ sta->vht_cap.vht_supported \|\|
	167	+ sta->he_cap.has_he) {
169	168	switch (sta->rx_nss) {
170	169	case 1:
171	170	watermark = SF_W_MARK_SISO;