Commit aa6c3961 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2022-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v6.2

First set of fixes for v6.2. Fix for a link error in mt76, fix for an
iwlwifi firmware crash and two cleanups.

* tag 'wireless-2022-12-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: ath9k: use proper statements in conditionals
  wifi: mt76: mt7996: select CONFIG_RELAY
  wifi: iwlwifi: fw: skip PPAG for JF
  wifi: ti: remove obsolete lines in the Makefile
====================

Link: https://lore.kernel.org/r/20221221180808.96A8AC433EF@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 609d3bc6 b7dc753f

drivers/net/wireless/ath/ath9k/htc.h

+7 −7
Original line number Diff line number Diff line
@@ -327,9 +327,9 @@ static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb) 
}



#ifdef CONFIG_ATH9K_HTC_DEBUGFS

#define __STAT_SAFE(hif_dev, expr)	((hif_dev)->htc_handle->drv_priv ? (expr) : 0)

#define CAB_STAT_INC(priv)		((priv)->debug.tx_stats.cab_queued++)

#define TX_QSTAT_INC(priv, q)		((priv)->debug.tx_stats.queue_stats[q]++)

#define __STAT_SAFE(hif_dev, expr)	do { ((hif_dev)->htc_handle->drv_priv ? (expr) : 0); } while (0)

#define CAB_STAT_INC(priv)		do { ((priv)->debug.tx_stats.cab_queued++); } while (0)

#define TX_QSTAT_INC(priv, q)		do { ((priv)->debug.tx_stats.queue_stats[q]++); } while (0)



#define TX_STAT_INC(hif_dev, c) \

		__STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c++)
@@ -378,10 +378,10 @@ void ath9k_htc_get_et_stats(struct ieee80211_hw *hw, 
			    struct ethtool_stats *stats, u64 *data);

#else



#define TX_STAT_INC(hif_dev, c)

#define TX_STAT_ADD(hif_dev, c, a)

#define RX_STAT_INC(hif_dev, c)

#define RX_STAT_ADD(hif_dev, c, a)

#define TX_STAT_INC(hif_dev, c)		do { } while (0)

#define TX_STAT_ADD(hif_dev, c, a)	do { } while (0)

#define RX_STAT_INC(hif_dev, c)		do { } while (0)

#define RX_STAT_ADD(hif_dev, c, a)	do { } while (0)



#define CAB_STAT_INC(priv)

#define TX_QSTAT_INC(priv, c)

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

+5 −0
Original line number Diff line number Diff line
@@ -1106,6 +1106,11 @@ int iwl_read_ppag_table(struct iwl_fw_runtime *fwrt, union iwl_ppag_table_cmd *c 
        int i, j, num_sub_bands;

        s8 *gain;



	/* many firmware images for JF lie about this */

	if (CSR_HW_RFID_TYPE(fwrt->trans->hw_rf_id) ==

	    CSR_HW_RFID_TYPE(CSR_HW_RF_ID_TYPE_JF))

		return -EOPNOTSUPP;



        if (!fw_has_capa(&fwrt->fw->ucode_capa, IWL_UCODE_TLV_CAPA_SET_PPAG)) {

                IWL_DEBUG_RADIO(fwrt,

                                "PPAG capability not supported by FW, command not sent.\n");

drivers/net/wireless/mediatek/mt76/mt7996/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config MT7996E

	tristate "MediaTek MT7996 (PCIe) support"

	select MT76_CONNAC_LIB

	select RELAY

	depends on MAC80211

	depends on PCI

	help

drivers/net/wireless/ti/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,6 +3,3 @@ obj-$(CONFIG_WLCORE) += wlcore/ 
obj-$(CONFIG_WL12XX)			+= wl12xx/

obj-$(CONFIG_WL1251)			+= wl1251/

obj-$(CONFIG_WL18XX)			+= wl18xx/
 


# small builtin driver bit

obj-$(CONFIG_WILINK_PLATFORM_DATA)	+= wilink_platform_data.o