diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/tokenring/smctr.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/tokenring/smctr.c')
| -rw-r--r-- | drivers/net/tokenring/smctr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index a91d9c55d78e..54ad4ed03374 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -4601,7 +4601,7 @@ static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
| 4601 | netif_stop_queue(dev); | 4601 | netif_stop_queue(dev); |
| 4602 | 4602 | ||
| 4603 | if(tp->QueueSkb == 0) | 4603 | if(tp->QueueSkb == 0) |
| 4604 | return (1); /* Return with tbusy set: queue full */ | 4604 | return NETDEV_TX_BUSY; /* Return with tbusy set: queue full */ |
| 4605 | 4605 | ||
| 4606 | tp->QueueSkb--; | 4606 | tp->QueueSkb--; |
| 4607 | skb_queue_tail(&tp->SendSkbQueue, skb); | 4607 | skb_queue_tail(&tp->SendSkbQueue, skb); |