Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
authorKalle Valo <kvalo@codeaurora.org>
Mon, 27 May 2019 12:15:29 +0000 (15:15 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 27 May 2019 12:15:29 +0000 (15:15 +0300)
ath.git patches for 5.3. Major changes:

ath10k

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

1  2 
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath10k/core.h
drivers/net/wireless/ath/ath10k/coredump.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/wil6210/cfg80211.c

index 9c703d287333e715349d818028f8db57cbd3dca0,98a7842e09b1fda6e86c0618e8765ab0733a5456..b500fd427595a9d2773d55bf6db9297674f4f472
@@@ -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;
Simple merge
Simple merge