Commit 5bb682b7 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] padto -f ix am79c961 using padto

parent 17a35e6b
...@@ -407,11 +407,19 @@ static int ...@@ -407,11 +407,19 @@ static int
am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev) am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev)
{ {
struct dev_priv *priv = (struct dev_priv *)dev->priv; struct dev_priv *priv = (struct dev_priv *)dev->priv;
unsigned int length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN; unsigned int length = skb->len;
unsigned int hdraddr, bufaddr; unsigned int hdraddr, bufaddr;
unsigned int head; unsigned int head;
unsigned long flags; unsigned long flags;
/* FIXME: I thought the 79c961 could do padding - RMK ??? */
if (length < ETH_ZLEN) {
skb = skb_padto(skb, ETH_ZLEN);
if (skb == NULL)
return 0;
length = ETH_ZLEN;
}
head = priv->txhead; head = priv->txhead;
hdraddr = priv->txhdr + (head << 3); hdraddr = priv->txhdr + (head << 3);
bufaddr = priv->txbuffer[head]; bufaddr = priv->txbuffer[head];
......
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