update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/wireless/ath/ath9k/htc.h
..
..
@@ -327,14 +327,18 @@
327
327
 }
328
328
 
329
329
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
330
-#define __STAT_SAFE(expr) (hif_dev->htc_handle->drv_priv ? (expr) : 0)
331
-#define TX_STAT_INC(c) __STAT_SAFE(hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)
332
-#define TX_STAT_ADD(c, a) __STAT_SAFE(hif_dev->htc_handle->drv_priv->debug.tx_stats.c += a)
333
-#define RX_STAT_INC(c) __STAT_SAFE(hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c++)
334
-#define RX_STAT_ADD(c, a) __STAT_SAFE(hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c += a)
335
-#define CAB_STAT_INC   priv->debug.tx_stats.cab_queued++
330
+#define __STAT_SAFE(hif_dev, expr)	do { ((hif_dev)->htc_handle->drv_priv ? (expr) : 0); } while (0)
331
+#define CAB_STAT_INC(priv)		do { ((priv)->debug.tx_stats.cab_queued++); } while (0)
332
+#define TX_QSTAT_INC(priv, q)		do { ((priv)->debug.tx_stats.queue_stats[q]++); } while (0)
336
333
 
337
-#define TX_QSTAT_INC(q) (priv->debug.tx_stats.queue_stats[q]++)
334
+#define TX_STAT_INC(hif_dev, c) \
335
+		__STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c++)
336
+#define TX_STAT_ADD(hif_dev, c, a) \
337
+		__STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c += a)
338
+#define RX_STAT_INC(hif_dev, c) \
339
+		__STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.skbrx_stats.c++)
340
+#define RX_STAT_ADD(hif_dev, c, a) \
341
+		__STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.skbrx_stats.c += a)
338
342
 
339
343
 void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
340
344
 			   struct ath_rx_status *rs);
..
..
@@ -374,13 +378,13 @@
374
378
 			    struct ethtool_stats *stats, u64 *data);
375
379
 #else
376
380
 
377
-#define TX_STAT_INC(c) do { } while (0)
378
-#define TX_STAT_ADD(c, a) do { } while (0)
379
-#define RX_STAT_INC(c) do { } while (0)
380
-#define RX_STAT_ADD(c, a) do { } while (0)
381
-#define CAB_STAT_INC   do { } while (0)
381
+#define TX_STAT_INC(hif_dev, c)		do { } while (0)
382
+#define TX_STAT_ADD(hif_dev, c, a)	do { } while (0)
383
+#define RX_STAT_INC(hif_dev, c)		do { } while (0)
384
+#define RX_STAT_ADD(hif_dev, c, a)	do { } while (0)
382
385
 
383
-#define TX_QSTAT_INC(c) do { } while (0)
386
+#define CAB_STAT_INC(priv)
387
+#define TX_QSTAT_INC(priv, c)
384
388
 
385
389
 static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,
386
390
 					 struct ath_rx_status *rs)