From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 27 May 2019 12:15:29 +0000 (+0300)
Subject: Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=889ca18093423af7bf224416fe7548a7e13e82fc;p=openwrt%2Fstaging%2Fblogic.git

Merge ath-next from git://git./linux/kernel/git/kvalo/ath.git

ath.git patches for 5.3. Major changes:

ath10k

* enable SDIO support, first one being QCA6174 hw3.2
---

889ca18093423af7bf224416fe7548a7e13e82fc
diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 9c703d287333,98a7842e09b1..b500fd427595
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -5774,9 -5778,13 +5778,13 @@@ static void ath10k_bss_info_changed(str
  	}
  
  	if (changed & BSS_CHANGED_MCAST_RATE &&
 -	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
 +	    !ath10k_mac_vif_chan(arvif->vif, &def)) {
  		band = def.chan->band;
- 		rateidx = vif->bss_conf.mcast_rate[band] - 1;
+ 		mcast_rate = vif->bss_conf.mcast_rate[band];
+ 		if (mcast_rate > 0)
+ 			rateidx = mcast_rate - 1;
+ 		else
+ 			rateidx = ffs(vif->bss_conf.basic_rates) - 1;
  
  		if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY)
  			rateidx += ATH10K_MAC_FIRST_OFDM_RATE_IDX;