Commit 1e2b1046 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2018-11-20' of... 

Merge tag 'wireless-drivers-for-davem-2018-11-20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.20

First set of fixes for 4.20, this time we have quite a few them but
all very small.

ath9k

* fix a locking regression found by a static checker

wlcore

* fix a crash which was a regression with wakeirq handling

brcm80211

* yet another fix for 160 MHz channel handling

mt76

* fix a longstaning build problem when CONFIG_LEDS_CLASS is disabled

* don't use uninitialised mutex

iwlwifi

* do note that the iwlwifi merge tag (commit 4ec321c1) seems to
  contain wrong list of changes so ignore that

* fix ACPI data handling, a memory leak and other smaller fixes

ath10k

* fix a crash during suspend which was a recent regression
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 86de5921 1770f0fa

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

+1 −1
Original line number Diff line number Diff line
@@ -6867,7 +6867,7 @@ static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	u32 bitmap;



	if (drop) {

		if (vif->type == NL80211_IFTYPE_STATION) {

		if (vif && vif->type == NL80211_IFTYPE_STATION) {

			bitmap = ~(1 << WMI_MGMT_TID);

			list_for_each_entry(arvif, &ar->arvifs, list) {

				if (arvif->vdev_type == WMI_VDEV_TYPE_STA)

drivers/net/wireless/ath/ath9k/main.c

+1 −2
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
	struct ath_vif *avp = (void *)vif->drv_priv;

	struct ath_node *an = &avp->mcast_node;



	mutex_lock(&sc->mutex);

	if (IS_ENABLED(CONFIG_ATH9K_TX99)) {

		if (sc->cur_chan->nvifs >= 1) {

			mutex_unlock(&sc->mutex);
@@ -1259,8 +1260,6 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 
		sc->tx99_vif = vif;

	}



	mutex_lock(&sc->mutex);



	ath_dbg(common, CONFIG, "Attach a VIF of type: %d\n", vif->type);

	sc->cur_chan->nvifs++;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+2 −1
Original line number Diff line number Diff line
@@ -6005,7 +6005,8 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg, 
			 * for subsequent chanspecs.

			 */

			channel->flags = IEEE80211_CHAN_NO_HT40 |

					 IEEE80211_CHAN_NO_80MHZ;

					 IEEE80211_CHAN_NO_80MHZ |

					 IEEE80211_CHAN_NO_160MHZ;

			ch.bw = BRCMU_CHAN_BW_20;

			cfg->d11inf.encchspec(&ch);

			chaninfo = ch.chspec;

drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c

+3 −0
Original line number Diff line number Diff line
@@ -193,6 +193,9 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch) 
		}

		break;

	case BRCMU_CHSPEC_D11AC_BW_160:

		ch->bw = BRCMU_CHAN_BW_160;

		ch->sb = brcmu_maskget16(ch->chspec, BRCMU_CHSPEC_D11AC_SB_MASK,

					 BRCMU_CHSPEC_D11AC_SB_SHIFT);

		switch (ch->sb) {

		case BRCMU_CHAN_SB_LLL:

			ch->control_ch_num -= CH_70MHZ_APART;

drivers/net/wireless/intel/iwlwifi/fw/acpi.h

+3 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        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
@@ -26,6 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017        Intel Deutschland GmbH

 * Copyright(c) 2018        Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -81,7 +83,7 @@ 
#define ACPI_WRDS_WIFI_DATA_SIZE	(ACPI_SAR_TABLE_SIZE + 2)

#define ACPI_EWRD_WIFI_DATA_SIZE	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_TABLE_SIZE + 3)

#define ACPI_WGDS_WIFI_DATA_SIZE	18

#define ACPI_WGDS_WIFI_DATA_SIZE	19

#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2

CRA Git | Maintained and supported by SUSTech CRA and CCSE