Skip to content

Commit 7fd551a

Browse files
Qianqiang Liukuba-moo
authored andcommitted
net: ag71xx: remove dead code path
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 <[email protected]> Reviewed-by: Vadim Fedorenko <[email protected]> Reviewed-by: Oleksij Rempel <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Qianqiang Liu <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent ef17c3d commit 7fd551a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

drivers/net/ethernet/atheros/ag71xx.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
16161616
unsigned int i = ring->curr & ring_mask;
16171617
struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
16181618
int pktlen;
1619-
int err = 0;
16201619

16211620
if (ag71xx_desc_empty(desc))
16221621
break;
@@ -1639,21 +1638,17 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
16391638

16401639
skb = napi_build_skb(ring->buf[i].rx.rx_buf, ag71xx_buffer_size(ag));
16411640
if (!skb) {
1641+
ndev->stats.rx_errors++;
16421642
skb_free_frag(ring->buf[i].rx.rx_buf);
16431643
goto next;
16441644
}
16451645

16461646
skb_reserve(skb, offset);
16471647
skb_put(skb, pktlen);
16481648

1649-
if (err) {
1650-
ndev->stats.rx_dropped++;
1651-
kfree_skb(skb);
1652-
} else {
1653-
skb->dev = ndev;
1654-
skb->ip_summed = CHECKSUM_NONE;
1655-
list_add_tail(&skb->list, &rx_list);
1656-
}
1649+
skb->dev = ndev;
1650+
skb->ip_summed = CHECKSUM_NONE;
1651+
list_add_tail(&skb->list, &rx_list);
16571652

16581653
next:
16591654
ring->buf[i].rx.rx_buf = NULL;

0 commit comments

Comments
 (0)