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/rrunner.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/rrunner.c')
| -rw-r--r-- | drivers/net/rrunner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index d890829a9acc..81dbcbb910f4 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -1425,7 +1425,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1425 | if (!(new_skb = dev_alloc_skb(len + 8))) { | 1425 | if (!(new_skb = dev_alloc_skb(len + 8))) { |
| 1426 | dev_kfree_skb(skb); | 1426 | dev_kfree_skb(skb); |
| 1427 | netif_wake_queue(dev); | 1427 | netif_wake_queue(dev); |
| 1428 | return -EBUSY; | 1428 | return NETDEV_TX_OK; |
| 1429 | } | 1429 | } |
| 1430 | skb_reserve(new_skb, 8); | 1430 | skb_reserve(new_skb, 8); |
| 1431 | skb_put(new_skb, len); | 1431 | skb_put(new_skb, len); |