kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sc92031: start transmit return value bugfix

Browse source 
Any negative return value from start_xmit is interpreted as NETDEV_TX_LOCK
which is not what this driver wants. It should return 0 (NETDEV_TX_OK)
when it consumes a packet.

Also, use skb_padto() as the generic way to pad small frames.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Stephen Hemminger 2008-04-02 10:11:11 -07:00 committed by Jeff Garzik
parent 9c28eaea90
commit 26a17b7bbb
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/sc92031.c
View file

@ -947,16 +947,16 @@ static struct net_device_stats *sc92031_get_stats(struct net_device *dev)
static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev) static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
int err = 0;
struct sc92031_priv *priv = netdev_priv(dev); struct sc92031_priv *priv = netdev_priv(dev);
void __iomem *port_base = priv->port_base; void __iomem *port_base = priv->port_base;
unsigned len; unsigned len;
unsigned entry; unsigned entry;
u32 tx_status; u32 tx_status;
if (skb_padto(skb, ETH_ZLEN))
return NETDEV_TX_OK;
if (unlikely(skb->len > TX_BUF_SIZE)) { if (unlikely(skb->len > TX_BUF_SIZE)) {
err = -EMSGSIZE;
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
goto out; goto out;
} }
@ -964,7 +964,6 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_lock(&priv->lock); spin_lock(&priv->lock);
if (unlikely(!netif_carrier_ok(dev))) { if (unlikely(!netif_carrier_ok(dev))) {
err = -ENOLINK;
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
goto out_unlock; goto out_unlock;
} }
@ -976,11 +975,6 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev)
skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE); skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);
len = skb->len; len = skb->len;
if (unlikely(len < ETH_ZLEN)) {
memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,
0, ETH_ZLEN - len);
len = ETH_ZLEN;
}
wmb(); wmb();
@ -1007,7 +1001,7 @@ out_unlock:
out: out:
dev_kfree_skb(skb); dev_kfree_skb(skb);
return err; return NETDEV_TX_OK;
} }
static int sc92031_open(struct net_device *dev) static int sc92031_open(struct net_device *dev)