5.4-stable patches

added patches:
	wifi-ath9k-use-proper-statements-in-conditionals.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index c5dd6a774685980111dac01a4db960bc08982e37..37cdf63f4ed0aebcd8c66edf195a2b2417bb752d 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -280,3 +280,4 @@ pci-hotplug-allow-marking-devices-as-disconnected-during-bind-unbind.patch
 pci-avoid-flr-for-amd-fch-ahci-adapters.patch
 drm-i915-quirks-add-inverted-backlight-quirk-for-hp-14-r206nv.patch
 drm-radeon-fix-edp-for-single-display-imac11-2.patch
+wifi-ath9k-use-proper-statements-in-conditionals.patch

diff --git a/queue-5.4/wifi-ath9k-use-proper-statements-in-conditionals.patch b/queue-5.4/wifi-ath9k-use-proper-statements-in-conditionals.patch
new file mode 100644 (file)
index 0000000..b02d069
--- /dev/null
+++ b/queue-5.4/wifi-ath9k-use-proper-statements-in-conditionals.patch
@@ -0,0 +1,63 @@
+From b7dc753fe33a707379e2254317794a4dad6c0fe2 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 15 Dec 2022 17:55:42 +0100
+Subject: wifi: ath9k: use proper statements in conditionals
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit b7dc753fe33a707379e2254317794a4dad6c0fe2 upstream.
+
+A previous cleanup patch accidentally broke some conditional
+expressions by replacing the safe "do {} while (0)" constructs
+with empty macros. gcc points this out when extra warnings
+are enabled:
+
+drivers/net/wireless/ath/ath9k/hif_usb.c: In function 'ath9k_skb_queue_complete':
+drivers/net/wireless/ath/ath9k/hif_usb.c:251:57: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
+  251 |                         TX_STAT_INC(hif_dev, skb_failed);
+
+Make both sets of macros proper expressions again.
+
+Fixes: d7fc76039b74 ("ath9k: htc: clean up statistics macros")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
+Signed-off-by: Kalle Valo <kvalo@kernel.org>
+Link: https://lore.kernel.org/r/20221215165553.1950307-1-arnd@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/wireless/ath/ath9k/htc.h |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/ath/ath9k/htc.h
++++ b/drivers/net/wireless/ath/ath9k/htc.h
+@@ -325,9 +325,9 @@ static inline struct ath9k_htc_tx_ctl *H
+ }
+ 
+ #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++)
+@@ -376,10 +376,10 @@ void ath9k_htc_get_et_stats(struct ieee8
+                           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)