diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-12 07:17:19 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 12:18:34 +0400 |
| commit | 4bd73ae2682d9069746bb049a416d9ab90c6684b (patch) | |
| tree | 06c1fa545e0fe2ee1e610db19fde49114b47f152 /drivers/net/irda/mcs7780.c | |
| parent | 3790c8cdb99f23824b23cb16df608281b335ee91 (diff) | |
| download | linux-4bd73ae2682d9069746bb049a416d9ab90c6684b.tar.xz | |
net: fix network drivers ndo_start_xmit() return values (part 2)
Fix up IRDA drivers that return an errno value to qdisc_restart(), causing
qdisc_restart() to print a warning an requeue/retransmit the skb.
- donauboe: intention appears to be to have the skb retransmitted without
error message
- irda-usb: intention is to drop silently according to comment
- kingsub-sir: skb is freed: use after free
- ks959-sir: skb is freed: use after free
- ksdazzle-sir: skb is freed: use after free
- mcs7880: skb is freed: use after free
All but donauboe compile tested.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/mcs7780.c')
| -rw-r--r-- | drivers/net/irda/mcs7780.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index fac504d0cfd8..f4df1001983c 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c @@ -824,10 +824,6 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev) int wraplen; int ret = 0; - - if (skb == NULL || ndev == NULL) - return -EINVAL; - netif_stop_queue(ndev); mcs = netdev_priv(ndev); @@ -870,7 +866,7 @@ static int mcs_hard_xmit(struct sk_buff *skb, struct net_device *ndev) dev_kfree_skb(skb); spin_unlock_irqrestore(&mcs->lock, flags); - return ret; + return NETDEV_TX_OK; } static const struct net_device_ops mcs_netdev_ops = { |