diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /drivers/net/pxa168_eth.c | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'drivers/net/pxa168_eth.c')
| -rw-r--r-- | drivers/net/pxa168_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c index e224740c6e2a..1f97db1fc4b1 100644 --- a/drivers/net/pxa168_eth.c +++ b/drivers/net/pxa168_eth.c | |||
| @@ -1276,7 +1276,7 @@ static int pxa168_eth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1276 | wmb(); | 1276 | wmb(); |
| 1277 | wrl(pep, SDMA_CMD, SDMA_CMD_TXDH | SDMA_CMD_ERD); | 1277 | wrl(pep, SDMA_CMD, SDMA_CMD_TXDH | SDMA_CMD_ERD); |
| 1278 | 1278 | ||
| 1279 | stats->tx_bytes += skb->len; | 1279 | stats->tx_bytes += length; |
| 1280 | stats->tx_packets++; | 1280 | stats->tx_packets++; |
| 1281 | dev->trans_start = jiffies; | 1281 | dev->trans_start = jiffies; |
| 1282 | if (pep->tx_ring_size - pep->tx_desc_count <= 1) { | 1282 | if (pep->tx_ring_size - pep->tx_desc_count <= 1) { |