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/typhoon.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/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 7fa5ec2de94..82653cb0785 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -846,7 +846,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
| 846 | if(typhoon_num_free_tx(txRing) < (numDesc + 2)) { | 846 | if(typhoon_num_free_tx(txRing) < (numDesc + 2)) { |
| 847 | netif_stop_queue(dev); | 847 | netif_stop_queue(dev); |
| 848 | 848 | ||
| 849 | /* A Tx complete IRQ could have gotten inbetween, making | 849 | /* A Tx complete IRQ could have gotten between, making |
| 850 | * the ring free again. Only need to recheck here, since | 850 | * the ring free again. Only need to recheck here, since |
| 851 | * Tx is serialized. | 851 | * Tx is serialized. |
| 852 | */ | 852 | */ |