From: Greg Kroah-Hartman Date: Wed, 8 Mar 2023 09:09:49 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v6.2.3~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70b7d52b19a8a9d1aa0f1d42382f20275134ed7d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: wifi-ath9k-use-proper-statements-in-conditionals.patch --- diff --git a/queue-4.19/series b/queue-4.19/series index 194536b0836..a50067060f9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -193,3 +193,4 @@ scsi-ses-fix-possible-desc_ptr-out-of-bounds-accesses.patch scsi-ses-fix-slab-out-of-bounds-in-ses_intf_remove.patch pci-avoid-flr-for-amd-fch-ahci-adapters.patch drm-radeon-fix-edp-for-single-display-imac11-2.patch +wifi-ath9k-use-proper-statements-in-conditionals.patch diff --git a/queue-4.19/wifi-ath9k-use-proper-statements-in-conditionals.patch b/queue-4.19/wifi-ath9k-use-proper-statements-in-conditionals.patch new file mode 100644 index 00000000000..b02d069a905 --- /dev/null +++ b/queue-4.19/wifi-ath9k-use-proper-statements-in-conditionals.patch @@ -0,0 +1,63 @@ +From b7dc753fe33a707379e2254317794a4dad6c0fe2 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +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 + +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 +Acked-by: Toke Høiland-Jørgensen +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/20221215165553.1950307-1-arnd@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + 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)