Commit 1e39b27b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'fix-silence-gcc-12-warnings-in-drivers-net-wireless' 

Jakub Kicinski says:

====================
Fix/silence GCC 12 warnings in drivers/net/wireless/

as mentioned off list we'd like to get GCC 12 warnings quashed.
This set takes care of the warnings we have in drivers/net/wireless/
mostly by relegating them to W=1/W=2 builds.
====================

Link: https://lore.kernel.org/r/20220520194320.2356236-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 17155d5d 13182526

drivers/net/wireless/ath/ath6kl/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ ath6kl_core-y += wmi.o 
ath6kl_core-y += core.o

ath6kl_core-y += recovery.o



# FIXME: temporarily silence -Wdangling-pointer on non W=1+ builds

ifndef KBUILD_EXTRA_WARN

CFLAGS_htc_mbox.o += -Wno-dangling-pointer

endif



ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath6kl_core-$(CONFIG_ATH6KL_TRACING) += trace.o

drivers/net/wireless/ath/ath9k/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ ath9k_hw-y:= \ 
		ar9003_eeprom.o \

		ar9003_paprd.o



# FIXME: temporarily silence -Warray-bounds on non W=1+ builds

ifndef KBUILD_EXTRA_WARN

CFLAGS_mac.o += -Wno-array-bounds

endif



ath9k_hw-$(CONFIG_ATH9K_WOW) += ar9003_wow.o



ath9k_hw-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += btcoex.o \

drivers/net/wireless/ath/carl9170/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -3,3 +3,8 @@ carl9170-objs := main.o usb.o cmd.o mac.o phy.o led.o fw.o tx.o rx.o 
carl9170-$(CONFIG_CARL9170_DEBUGFS) += debug.o



obj-$(CONFIG_CARL9170) += carl9170.o



# FIXME: temporarily silence -Warray-bounds on non W=1+ builds

ifndef KBUILD_EXTRA_WARN

CFLAGS_cmd.o += -Wno-array-bounds

endif

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

+1 −1
Original line number Diff line number Diff line
@@ -2167,7 +2167,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, 
		offsetof(struct brcmf_assoc_params_le, chanspec_list);

	if (cfg->channel)

		join_params_size += sizeof(u16);

	ext_join_params = kzalloc(join_params_size, GFP_KERNEL);

	ext_join_params = kzalloc(sizeof(*ext_join_params), GFP_KERNEL);

	if (ext_join_params == NULL) {

		err = -ENOMEM;

		goto done;

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static bool iwl_mvm_remove_inactive_tids(struct iwl_mvm *mvm, 
					 unsigned long *unshare_queues,

					 unsigned long *changetid_queues)

{

	int tid;

	unsigned int tid;



	lockdep_assert_held(&mvmsta->lock);

	lockdep_assert_held(&mvm->mutex);