2d6e433e1d
Upstream patch updated to fix kernel 6.6 compilation. It was also split up into 5. Do the same here. The patches are taken from this upstreasm PR: https://github.com/kaloz/mwlwifi/pull/413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15452 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
29 lines
1.9 KiB
Diff
29 lines
1.9 KiB
Diff
From 44419b1feae3eedda21cdc71da9acb611ca1a6fd Mon Sep 17 00:00:00 2001
|
|
From: Christian Marangi <ansuelsmth@gmail.com>
|
|
Date: Sun, 12 May 2024 14:42:01 +0200
|
|
Subject: [PATCH] Fix debugfs compilation warning in mwl_debugfs_info_read
|
|
|
|
Fix debugfs compilation warning on 64Bit mwl_debugfs_info_read by
|
|
casing for uintptr_t and use %zx.
|
|
|
|
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
|
---
|
|
debugfs.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/debugfs.c
|
|
+++ b/debugfs.c
|
|
@@ -364,10 +364,10 @@ static ssize_t mwl_debugfs_info_read(str
|
|
"-----------------------=> address| address|qlen|fw_desc_cnt\n");
|
|
spin_lock_irqsave(&pcie_priv->tx_desc_lock, flags);
|
|
len += scnprintf(p + len, size - len,
|
|
- "wcb_base0 : %x => %8x|%8p|%4d|%d\n", get_hw_spec->wcb_base0, *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),skb_queue_len(&pcie_priv->txq[0]),pcie_priv->fw_desc_cnt[0]);
|
|
+ "wcb_base0 : %x => %8px|%8p|%4d|%d\n", get_hw_spec->wcb_base0, (void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base0),(void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base0),skb_queue_len(&pcie_priv->txq[0]),pcie_priv->fw_desc_cnt[0]);
|
|
for(i = 0; i < SYSADPT_TOTAL_TX_QUEUES - 1; i++)
|
|
len += scnprintf(p + len, size - len,
|
|
- "wcb_base[%2d]: %x => %8x|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
|
|
+ "wcb_base[%2d]: %x => %8px|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], (void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base[i]),(void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base[i]),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
|
|
spin_unlock_irqrestore(&pcie_priv->tx_desc_lock, flags);
|
|
}
|
|
|