diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/acenic.c | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/acenic.c')
-rw-r--r-- | drivers/net/acenic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 41d9911202d0..ee648fe5d96f 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
@@ -1584,7 +1584,7 @@ static void ace_watchdog(struct net_device *data) | |||
1584 | /* | 1584 | /* |
1585 | * We haven't received a stats update event for more than 2.5 | 1585 | * We haven't received a stats update event for more than 2.5 |
1586 | * seconds and there is data in the transmit queue, thus we | 1586 | * seconds and there is data in the transmit queue, thus we |
1587 | * asume the card is stuck. | 1587 | * assume the card is stuck. |
1588 | */ | 1588 | */ |
1589 | if (*ap->tx_csm != ap->tx_ret_csm) { | 1589 | if (*ap->tx_csm != ap->tx_ret_csm) { |
1590 | printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n", | 1590 | printk(KERN_WARNING "%s: Transmitter is stuck, %08x\n", |
@@ -2564,7 +2564,7 @@ restart: | |||
2564 | 2564 | ||
2565 | /* | 2565 | /* |
2566 | * A TX-descriptor producer (an IRQ) might have gotten | 2566 | * A TX-descriptor producer (an IRQ) might have gotten |
2567 | * inbetween, making the ring free again. Since xmit is | 2567 | * between, making the ring free again. Since xmit is |
2568 | * serialized, this is the only situation we have to | 2568 | * serialized, this is the only situation we have to |
2569 | * re-test. | 2569 | * re-test. |
2570 | */ | 2570 | */ |