openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: korina: optimize rx descriptor flags processing 

Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roman Yeryomin 2017-09-17 20:24:26 +03:00 committed by David S. Miller
parent 7ce103b4cb
commit 364a97f5d1
1 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
drivers/net/ethernet/korina.c
View File

@ -363,59 +363,60 @@ static int korina_rx(struct net_device *dev, int limit)
if ((KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) == 0) if ((KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) == 0)
break; break;
/* Update statistics counters */ /* check that this is a whole packet
if (devcs & ETH_RX_CRC) * WARNING: DMA_FD bit incorrectly set
dev->stats.rx_crc_errors++; * in Rc32434 (errata ref #077) */
if (devcs & ETH_RX_LOR) if (!(devcs & ETH_RX_LD))
dev->stats.rx_length_errors++; goto next;
if (devcs & ETH_RX_LE)
dev->stats.rx_length_errors++; if (!(devcs & ETH_RX_ROK)) {
if (devcs & ETH_RX_OVR) /* Update statistics counters */
dev->stats.rx_fifo_errors++; dev->stats.rx_errors++;
if (devcs & ETH_RX_CV) dev->stats.rx_dropped++;
dev->stats.rx_frame_errors++; if (devcs & ETH_RX_CRC)
if (devcs & ETH_RX_CES) dev->stats.rx_crc_errors++;
dev->stats.rx_length_errors++; if (devcs & ETH_RX_LE)
dev->stats.rx_length_errors++;
if (devcs & ETH_RX_OVR)
dev->stats.rx_fifo_errors++;
if (devcs & ETH_RX_CV)
dev->stats.rx_frame_errors++;
if (devcs & ETH_RX_CES)
dev->stats.rx_frame_errors++;
goto next;
}
pkt_len = RCVPKT_LENGTH(devcs);
/* must be the (first and) last
* descriptor then */
pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data;
/* invalidate the cache */
dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4);
/* Malloc up new buffer. */
skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);
if (!skb_new)
break;
/* Do not count the CRC */
skb_put(skb, pkt_len - 4);
skb->protocol = eth_type_trans(skb, dev);
/* Pass the packet to upper layers */
netif_receive_skb(skb);
dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len;
/* Update the mcast stats */
if (devcs & ETH_RX_MP) if (devcs & ETH_RX_MP)
dev->stats.multicast++; dev->stats.multicast++;
if ((devcs & ETH_RX_LD) != ETH_RX_LD) { lp->rx_skb[lp->rx_next_done] = skb_new;
/* check that this is a whole packet
* WARNING: DMA_FD bit incorrectly set
* in Rc32434 (errata ref #077) */
dev->stats.rx_errors++;
dev->stats.rx_dropped++;
} else if ((devcs & ETH_RX_ROK)) {
pkt_len = RCVPKT_LENGTH(devcs);
/* must be the (first and) last
* descriptor then */
pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data;
/* invalidate the cache */
dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4);
/* Malloc up new buffer. */
skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);
if (!skb_new)
break;
/* Do not count the CRC */
skb_put(skb, pkt_len - 4);
skb->protocol = eth_type_trans(skb, dev);
/* Pass the packet to upper layers */
netif_receive_skb(skb);
dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len;
/* Update the mcast stats */
if (devcs & ETH_RX_MP)
dev->stats.multicast++;
lp->rx_skb[lp->rx_next_done] = skb_new;
}
next:
rd->devcs = 0; rd->devcs = 0;
/* Restore descriptor's curr_addr */ /* Restore descriptor's curr_addr */