diff options
| author | Kalle Valo <kvalo@kernel.org> | 2022-10-29 08:25:50 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-10-29 08:25:50 +0300 |
| commit | a9501019f2de706eb43b59d66dcde70a23440cd3 (patch) | |
| tree | faf4f1b8a7c8bc9eed229ac690bcb953fd604995 /drivers/net/wireless/ath/carl9170 | |
| parent | 637639cbfebb747406b9a57befc0b347057a3a24 (diff) | |
| parent | f3ca72b0327101a074a871539e61775d43908ca4 (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v6.2. Major changes:
ath11k
* support configuring channel dwell time during scan
Diffstat (limited to 'drivers/net/wireless/ath/carl9170')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/wlan.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/carl9170/Makefile b/drivers/net/wireless/ath/carl9170/Makefile index 7463baa62fa8..1a81868ce26d 100644 --- a/drivers/net/wireless/ath/carl9170/Makefile +++ b/drivers/net/wireless/ath/carl9170/Makefile @@ -3,8 +3,3 @@ 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 diff --git a/drivers/net/wireless/ath/carl9170/wlan.h b/drivers/net/wireless/ath/carl9170/wlan.h index 0a4e42e806b9..ded2c6d0a759 100644 --- a/drivers/net/wireless/ath/carl9170/wlan.h +++ b/drivers/net/wireless/ath/carl9170/wlan.h @@ -271,7 +271,7 @@ struct ar9170_tx_frame { union { struct ieee80211_hdr i3e; - u8 payload[0]; + DECLARE_FLEX_ARRAY(u8, payload); } data; } __packed; |