Skip to content

Commit

Permalink
GRETH: RX/TX bytes were never increased
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
daniel-hellstrom authored and davem330 committed Sep 20, 2011
1 parent 8603e33 commit 6af29a9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/net/greth.c
Expand Up @@ -428,6 +428,7 @@ greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
dma_sync_single_for_device(greth->dev, dma_addr, skb->len, DMA_TO_DEVICE);

status = GRETH_BD_EN | GRETH_BD_IE | (skb->len & GRETH_BD_LEN);
greth->tx_bufs_length[greth->tx_next] = skb->len & GRETH_BD_LEN;

/* Wrap around descriptor ring */
if (greth->tx_next == GRETH_TXBD_NUM_MASK) {
Expand Down Expand Up @@ -641,6 +642,7 @@ static void greth_clean_tx(struct net_device *dev)
dev->stats.tx_fifo_errors++;
}
dev->stats.tx_packets++;
dev->stats.tx_bytes += greth->tx_bufs_length[greth->tx_last];
greth->tx_last = NEXT_TX(greth->tx_last);
greth->tx_free++;
}
Expand Down Expand Up @@ -695,6 +697,7 @@ static void greth_clean_tx_gbit(struct net_device *dev)
greth->tx_skbuff[greth->tx_last] = NULL;

greth_update_tx_stats(dev, stat);
dev->stats.tx_bytes += skb->len;

bdp = greth->tx_bd_base + greth->tx_last;

Expand Down Expand Up @@ -796,6 +799,7 @@ static int greth_rx(struct net_device *dev, int limit)
memcpy(skb_put(skb, pkt_len), phys_to_virt(dma_addr), pkt_len);

skb->protocol = eth_type_trans(skb, dev);
dev->stats.rx_bytes += pkt_len;
dev->stats.rx_packets++;
netif_receive_skb(skb);
}
Expand Down Expand Up @@ -910,6 +914,7 @@ static int greth_rx_gbit(struct net_device *dev, int limit)

skb->protocol = eth_type_trans(skb, dev);
dev->stats.rx_packets++;
dev->stats.rx_bytes += pkt_len;
netif_receive_skb(skb);

greth->rx_skbuff[greth->rx_cur] = newskb;
Expand Down
1 change: 1 addition & 0 deletions drivers/net/greth.h
Expand Up @@ -103,6 +103,7 @@ struct greth_private {

unsigned char *tx_bufs[GRETH_TXBD_NUM];
unsigned char *rx_bufs[GRETH_RXBD_NUM];
u16 tx_bufs_length[GRETH_TXBD_NUM];

u16 tx_next;
u16 tx_last;
Expand Down

0 comments on commit 6af29a9

Please sign in to comment.