Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fa9433f authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git fixes for 4.18. Major changes:

wcn36xx

* convert testmode.c to plain ASCII

ath10k

* fix a firmware crash during bandwidth change
parents 9a98302d 371d5e9d

drivers/net/wireless/ath/ath10k/mac.c

+14 −2
Original line number Diff line number Diff line
@@ -6058,8 +6058,19 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) 
			   ath10k_mac_max_vht_nss(vht_mcs_mask)));



	if (changed & IEEE80211_RC_BW_CHANGED) {

		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d\n",

			   sta->addr, bw);

		enum wmi_phy_mode mode;



		mode = chan_to_phymode(&def);

		ath10k_dbg(ar, ATH10K_DBG_MAC, "mac update sta %pM peer bw %d phymode %d\n",

				sta->addr, bw, mode);



		err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,

				WMI_PEER_PHYMODE, mode);

		if (err) {

			ath10k_warn(ar, "failed to update STA %pM peer phymode %d: %d\n",

					sta->addr, mode, err);

			goto exit;

		}



		err = ath10k_wmi_peer_set_param(ar, arvif->vdev_id, sta->addr,

						WMI_PEER_CHAN_WIDTH, bw);
@@ -6100,6 +6111,7 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk) 
				    sta->addr);

	}



exit:

	mutex_unlock(&ar->conf_mutex);

}

drivers/net/wireless/ath/ath10k/wmi.h

+1 −0
Original line number Diff line number Diff line
@@ -6144,6 +6144,7 @@ enum wmi_peer_param { 
	WMI_PEER_NSS        = 0x5,

	WMI_PEER_USE_4ADDR  = 0x6,

	WMI_PEER_DEBUG      = 0xa,

	WMI_PEER_PHYMODE    = 0xd,

	WMI_PEER_DUMMY_VAR  = 0xff, /* dummy parameter for STA PS workaround */

};

drivers/net/wireless/ath/wcn36xx/testmode.c

+1 −1
Original line number Diff line number Diff line 
/*

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any