diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-12 07:00:35 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 12:18:32 +0400 |
| commit | 3790c8cdb99f23824b23cb16df608281b335ee91 (patch) | |
| tree | c437f801a709cefcf1210eb1e9f8306e52f42ca6 /drivers/net/ibmlana.c | |
| parent | da6782927de809d9d427bd4bd6a4024243e41f13 (diff) | |
| download | linux-3790c8cdb99f23824b23cb16df608281b335ee91.tar.xz | |
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/ibmlana.c')
| -rw-r--r-- | drivers/net/ibmlana.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index c25bc0bc0b25..448098d3b39b 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c @@ -815,7 +815,7 @@ static int ibmlana_close(struct net_device *dev) static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) { ibmlana_priv *priv = netdev_priv(dev); - int retval = 0, tmplen, addr; + int tmplen, addr; unsigned long flags; tda_t tda; int baddr; @@ -824,7 +824,6 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) the upper layer is in deep desperation and we simply ignore the frame. */ if (priv->txusedcnt >= TXBUFCNT) { - retval = -EIO; dev->stats.tx_dropped++; goto tx_done; } @@ -874,7 +873,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) spin_unlock_irqrestore(&priv->lock, flags); tx_done: dev_kfree_skb(skb); - return retval; + return NETDEV_TX_OK; } /* switch receiver mode. */ |