diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-11 23:00:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-13 04:18:32 -0400 |
commit | 3790c8cdb99f23824b23cb16df608281b335ee91 (patch) | |
tree | c437f801a709cefcf1210eb1e9f8306e52f42ca6 /drivers/net/rrunner.c | |
parent | da6782927de809d9d427bd4bd6a4024243e41f13 (diff) |
net: fix network driver ndo_start_xmit() return values (part 1)
Fix up drivers that return an errno value to qdisc_restart(), causing
qdisc_restart() to print a warning and requeue/retransmit the skb.
- xpnet: memory allocation error, intention is to drop
- ethoc: oversized packet, packet must be dropped
- ibmlana: skb freed: use after free
- rrunner: skb freed: use after free
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
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); |