mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 20:35:47 +00:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From e368d2a1e8b6f0926e4e76a56b484249905192f5 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 6 Mar 2025 11:52:20 +0100
|
|
Subject: [PATCH] net: airoha: Fix dev->dsa_ptr check in airoha_get_dsa_tag()
|
|
|
|
Fix the following warning reported by Smatch static checker in
|
|
airoha_get_dsa_tag routine:
|
|
|
|
drivers/net/ethernet/airoha/airoha_eth.c:1722 airoha_get_dsa_tag()
|
|
warn: 'dp' isn't an ERR_PTR
|
|
|
|
dev->dsa_ptr can't be set to an error pointer, it can just be NULL.
|
|
Remove this check since it is already performed in netdev_uses_dsa().
|
|
|
|
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
|
|
Closes: https://lore.kernel.org/netdev/Z8l3E0lGOcrel07C@lore-desk/T/#m54adc113fcdd8c5e6c5f65ffd60d8e8b1d483d90
|
|
Fixes: af3cf757d5c9 ("net: airoha: Move DSA tag in DMA descriptor")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/20250306-airoha-flowtable-fixes-v1-1-68d3c1296cdd@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1741,18 +1741,13 @@ static u32 airoha_get_dsa_tag(struct sk_
|
|
{
|
|
#if IS_ENABLED(CONFIG_NET_DSA)
|
|
struct ethhdr *ehdr;
|
|
- struct dsa_port *dp;
|
|
u8 xmit_tpid;
|
|
u16 tag;
|
|
|
|
if (!netdev_uses_dsa(dev))
|
|
return 0;
|
|
|
|
- dp = dev->dsa_ptr;
|
|
- if (IS_ERR(dp))
|
|
- return 0;
|
|
-
|
|
- if (dp->tag_ops->proto != DSA_TAG_PROTO_MTK)
|
|
+ if (dev->dsa_ptr->tag_ops->proto != DSA_TAG_PROTO_MTK)
|
|
return 0;
|
|
|
|
if (skb_cow_head(skb, 0))
|