diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-12 05:17:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-13 10:18:34 +0200 |
| commit | 4bd73ae2682d9069746bb049a416d9ab90c6684b (patch) | |
| tree | 06c1fa545e0fe2ee1e610db19fde49114b47f152 /drivers/net/irda/ks959-sir.c | |
| parent | net: fix network driver ndo_start_xmit() return values (part 1) (diff) | |
| download | linux-4bd73ae2682d9069746bb049a416d9ab90c6684b.tar.xz linux-4bd73ae2682d9069746bb049a416d9ab90c6684b.zip | |
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/ks959-sir.c')
| -rw-r--r-- | drivers/net/irda/ks959-sir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index b6ffe9715b61..d73b8b64fcb9 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c @@ -391,9 +391,6 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev) unsigned int wraplen; int ret = 0; - if (skb == NULL || netdev == NULL) - return -EINVAL; - netif_stop_queue(netdev); /* the IRDA wrapping routines don't deal with non linear skb */ @@ -428,7 +425,7 @@ static int ks959_hard_xmit(struct sk_buff *skb, struct net_device *netdev) dev_kfree_skb(skb); spin_unlock(&kingsun->lock); - return ret; + return NETDEV_TX_OK; } /* Receive callback function */ |