diff --git a/[refs] b/[refs] index d59faba2fb48..745c55ebec15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fa15bbdd8a1ac096819df29db8d69b063752bee +refs/heads/master: 3440ecc4538b7e833b979af9caec613c984b2302 diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c index 9ffbf6e39b32..db33573efcf6 100644 --- a/trunk/drivers/net/ethernet/rdc/r6040.c +++ b/trunk/drivers/net/ethernet/rdc/r6040.c @@ -605,7 +605,7 @@ static void r6040_tx(struct net_device *dev) err = ioread16(ioaddr + MLSR); if (err & 0x0200) - dev->stats.rx_fifo_errors++; + dev->stats.tx_fifo_errors++; if (err & (0x2000 | 0x4000)) dev->stats.tx_carrier_errors++;