Commit 85ea9833 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: enable SF also when we have HE 



We shouldn't do this just for HT/VHT, but be future-proof
and also check for HE.

Change-Id: Icaeff714c00a773681dbfee72558afd1c7121c5d
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 1454edca

drivers/net/wireless/intel/iwlwifi/mvm/sf.c

+5 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -29,7 +29,7 @@ 
 *

 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018-2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,9 @@ static void iwl_mvm_fill_sf_command(struct iwl_mvm *mvm, 
	 * capabilities of the AP station, and choose the watermark accordingly.

	 */

	if (sta) {

		if (sta->ht_cap.ht_supported || sta->vht_cap.vht_supported) {

		if (sta->ht_cap.ht_supported ||

		    sta->vht_cap.vht_supported ||

		    sta->he_cap.has_he) {

			switch (sta->rx_nss) {

			case 1:

				watermark = SF_W_MARK_SISO;