aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibmlana.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-11 23:00:35 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-13 04:18:32 -0400
commit3790c8cdb99f23824b23cb16df608281b335ee91 (patch)
treec437f801a709cefcf1210eb1e9f8306e52f42ca6 /drivers/net/ibmlana.c
parentda6782927de809d9d427bd4bd6a4024243e41f13 (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/ibmlana.c')
-rw-r--r--drivers/net/ibmlana.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index c25bc0bc0b2..448098d3b39 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -815,7 +815,7 @@ static int ibmlana_close(struct net_device *dev)
815static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) 815static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
816{ 816{
817 ibmlana_priv *priv = netdev_priv(dev); 817 ibmlana_priv *priv = netdev_priv(dev);
818 int retval = 0, tmplen, addr; 818 int tmplen, addr;
819 unsigned long flags; 819 unsigned long flags;
820 tda_t tda; 820 tda_t tda;
821 int baddr; 821 int baddr;
@@ -824,7 +824,6 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
824 the upper layer is in deep desperation and we simply ignore the frame. */ 824 the upper layer is in deep desperation and we simply ignore the frame. */
825 825
826 if (priv->txusedcnt >= TXBUFCNT) { 826 if (priv->txusedcnt >= TXBUFCNT) {
827 retval = -EIO;
828 dev->stats.tx_dropped++; 827 dev->stats.tx_dropped++;
829 goto tx_done; 828 goto tx_done;
830 } 829 }
@@ -874,7 +873,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
874 spin_unlock_irqrestore(&priv->lock, flags); 873 spin_unlock_irqrestore(&priv->lock, flags);
875tx_done: 874tx_done:
876 dev_kfree_skb(skb); 875 dev_kfree_skb(skb);
877 return retval; 876 return NETDEV_TX_OK;
878} 877}
879 878
880/* switch receiver mode. */ 879/* switch receiver mode. */