From 04b7f2c70b77c566907b3c5fb3b3ee4b9dec18a4 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 21 Jun 2011 16:00:24 -0700 Subject: [PATCH] --- yaml --- r: 255649 b: refs/heads/master c: 73151ce35bd6d56e61a87b2855193f82540bf3d3 h: refs/heads/master i: 255647: dd7cf0dc694c5d4bcec92da76e05d88dd12df067 v: v3 --- [refs] | 2 +- trunk/drivers/net/mv643xx_eth.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c83337d4e00..0b5b1795bd7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e00f85bec0a9924eb517ccd126ddbb9787068f53 +refs/heads/master: 73151ce35bd6d56e61a87b2855193f82540bf3d3 diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index a5d9b1c310b3..1b7d2c1c34b6 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/drivers/net/mv643xx_eth.c @@ -859,7 +859,7 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb) static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) { struct mv643xx_eth_private *mp = netdev_priv(dev); - int queue; + int length, queue; struct tx_queue *txq; struct netdev_queue *nq; @@ -881,10 +881,12 @@ static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } + length = skb->len; + if (!txq_submit_skb(txq, skb)) { int entries_left; - txq->tx_bytes += skb->len; + txq->tx_bytes += length; txq->tx_packets++; entries_left = txq->tx_ring_size - txq->tx_desc_count;