Commit e368d2a1 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

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: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/netdev/Z8l3E0lGOcrel07C@lore-desk/T/#m54adc113fcdd8c5e6c5f65ffd60d8e8b1d483d90


Fixes: af3cf757 ("net: airoha: Move DSA tag in DMA descriptor")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250306-airoha-flowtable-fixes-v1-1-68d3c1296cdd@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 53058104

drivers/net/ethernet/airoha/airoha_eth.c

+1 −6
Original line number Diff line number Diff line
@@ -1741,18 +1741,13 @@ static u32 airoha_get_dsa_tag(struct sk_buff *skb, struct net_device *dev) 
{

#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))