korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 04:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: ag71xx: remove dead code path

Browse Source 
The "err" is always zero, so the following branch can never be executed:
if (err) {
	ndev->stats.rx_dropped++;
	kfree_skb(skb);
}
Therefore, the "if" statement can be removed.

Use "ndev->stats.rx_errors" to count "napi_build_skb()" failure

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/20240911135828.378317-1-usama.anjum@collabora.com
Signed-off-by: Qianqiang Liu <qianqiang.liu@163.com>
Link: https://patch.msgid.link/20240913014731.149739-1-qianqiang.liu@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Qianqiang Liu 2024-09-13 09:47:32 +08:00 committed by Jakub Kicinski
parent ef17c3d22c
commit 7fd551a87b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/atheros/ag71xx.c
View File

@ -1616,7 +1616,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
unsigned int i = ring->curr & ring_mask; unsigned int i = ring->curr & ring_mask;
struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
int pktlen; int pktlen;
int err = 0;
if (ag71xx_desc_empty(desc)) if (ag71xx_desc_empty(desc))
break; break;
@ -1639,6 +1638,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
skb = napi_build_skb(ring->buf[i].rx.rx_buf, ag71xx_buffer_size(ag)); skb = napi_build_skb(ring->buf[i].rx.rx_buf, ag71xx_buffer_size(ag));
if (!skb) { if (!skb) {
ndev->stats.rx_errors++;
skb_free_frag(ring->buf[i].rx.rx_buf); skb_free_frag(ring->buf[i].rx.rx_buf);
goto next; goto next;
} }
@ -1646,14 +1646,9 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
skb_reserve(skb, offset); skb_reserve(skb, offset);
skb_put(skb, pktlen); skb_put(skb, pktlen);
if (err) { skb->dev = ndev;
ndev->stats.rx_dropped++; skb->ip_summed = CHECKSUM_NONE;
kfree_skb(skb); list_add_tail(&skb->list, &rx_list);
} else {
skb->dev = ndev;
skb->ip_summed = CHECKSUM_NONE;
list_add_tail(&skb->list, &rx_list);
}
next: next:
ring->buf[i].rx.rx_buf = NULL; ring->buf[i].rx.rx_buf = NULL;