aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-12 05:34:37 +0000
committerDavid S. Miller <davem@davemloft.net>2009-06-13 01:18:43 -0700
commit81fbbf60408ad6b98ff72120de948cb7fd2498d0 (patch)
tree5612bc41fdce360b4846ce1142d7f7db59765a7d
parentnet: fix network drivers ndo_start_xmit() return values (part 6) (diff)
downloadlinux-dev-81fbbf60408ad6b98ff72120de948cb7fd2498d0.tar.xz
linux-dev-81fbbf60408ad6b98ff72120de948cb7fd2498d0.zip
net: fix network drivers ndo_start_xmit() return values (part 7)
Fix up ATM drivers that return an errno value to qdisc_restart(), causing qdisc_restart() to print a warning an requeue/retransmit the skb. - lec: condition can only be remedied by userspace, until that retransmissions Compile tested only. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/atm/lec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 75b9d59553fc..ff2e594dca9b 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -270,7 +270,8 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev)
printk("%s:No lecd attached\n", dev->name);
dev->stats.tx_errors++;
netif_stop_queue(dev);
- return -EUNATCH;
+ kfree_skb(skb);
+ return NETDEV_TX_OK;
}
pr_debug("skbuff head:%lx data:%lx tail:%lx end:%lx\n",