Commit 268000b7 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] padto - fix 82596 using skb_padto

parent 8cee0ea3
...@@ -1063,12 +1063,18 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1063,12 +1063,18 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct i596_private *lp = (struct i596_private *) dev->priv; struct i596_private *lp = (struct i596_private *) dev->priv;
struct tx_cmd *tx_cmd; struct tx_cmd *tx_cmd;
struct i596_tbd *tbd; struct i596_tbd *tbd;
short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; short length = skb->len;
dev->trans_start = jiffies; dev->trans_start = jiffies;
DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name, DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name,
skb->len, (unsigned int)skb->data)); skb->len, (unsigned int)skb->data));
if (skb->len < ETH_ZLEN) {
skb = skb_padto(skb, ETH_ZLEN);
if (skb == NULL)
return 0;
length = ETH_ZLEN;
}
netif_stop_queue(dev); netif_stop_queue(dev);
tx_cmd = lp->tx_cmds + lp->next_tx_cmd; tx_cmd = lp->tx_cmds + lp->next_tx_cmd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment