diff options
| author | Conley Lee <conleylee@foxmail.com> | 2021-12-14 17:11:06 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-15 10:29:03 +0000 |
| commit | 3899c928bccc5068405cd0e9a3a8fea67b097e9e (patch) | |
| tree | c170b917ed5c8068df36eac0afa84ee8b867c3a9 /drivers/net/ethernet/allwinner | |
| parent | 34ac17ecbf575eb079094d44f1bd30c66897aa21 (diff) | |
| download | linux-stable-3899c928bccc5068405cd0e9a3a8fea67b097e9e.tar.gz linux-stable-3899c928bccc5068405cd0e9a3a8fea67b097e9e.tar.bz2 linux-stable-3899c928bccc5068405cd0e9a3a8fea67b097e9e.zip | |
sun4i-emac.c: remove unnecessary branch
According to the current implementation of emac_rx, every arrived packet
will be processed in the while loop. So, there is no remain packet last
time. The skb_last field and this branch for dealing with it is
unnecessary.
Signed-off-by: Conley Lee <conleylee@foxmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/allwinner')
| -rw-r--r-- | drivers/net/ethernet/allwinner/sun4i-emac.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 800ee022388f..cccf8a3ead5e 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -76,7 +76,6 @@ struct emac_board_info { void __iomem *membase; u32 msg_enable; struct net_device *ndev; - struct sk_buff *skb_last; u16 tx_fifo_stat; int emacrx_completed_flag; @@ -499,7 +498,6 @@ static void emac_rx(struct net_device *dev) struct sk_buff *skb; u8 *rdptr; bool good_packet; - static int rxlen_last; unsigned int reg_val; u32 rxhdr, rxstatus, rxcount, rxlen; @@ -514,22 +512,6 @@ static void emac_rx(struct net_device *dev) if (netif_msg_rx_status(db)) dev_dbg(db->dev, "RXCount: %x\n", rxcount); - if ((db->skb_last != NULL) && (rxlen_last > 0)) { - dev->stats.rx_bytes += rxlen_last; - - /* Pass to upper layer */ - db->skb_last->protocol = eth_type_trans(db->skb_last, - dev); - netif_rx(db->skb_last); - dev->stats.rx_packets++; - db->skb_last = NULL; - rxlen_last = 0; - - reg_val = readl(db->membase + EMAC_RX_CTL_REG); - reg_val &= ~EMAC_RX_CTL_DMA_EN; - writel(reg_val, db->membase + EMAC_RX_CTL_REG); - } - if (!rxcount) { db->emacrx_completed_flag = 1; reg_val = readl(db->membase + EMAC_INT_CTL_REG); |