Commit 6cae1f24 authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/netdev-2.6/8390

into pobox.com:/garz/repo/net-drivers-2.6
parents 05c5f695 a358cc9e
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
Paul Gortmaker : Separate out Tx timeout code from Tx path. Paul Gortmaker : Separate out Tx timeout code from Tx path.
Paul Gortmaker : Remove old unused single Tx buffer code. Paul Gortmaker : Remove old unused single Tx buffer code.
Hayato Fujiwara : Add m32r support. Hayato Fujiwara : Add m32r support.
Paul Gortmaker : use skb_padto() instead of stack scratch area
Sources: Sources:
The National Semiconductor LAN Databook, and the 3Com 3c503 databook. The National Semiconductor LAN Databook, and the 3Com 3c503 databook.
...@@ -272,11 +273,15 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -272,11 +273,15 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
long e8390_base = dev->base_addr; long e8390_base = dev->base_addr;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
int length, send_length, output_page; int send_length = skb->len, output_page;
unsigned long flags; unsigned long flags;
char scratch[ETH_ZLEN];
length = skb->len; if (skb->len < ETH_ZLEN) {
skb = skb_padto(skb, ETH_ZLEN);
if (skb == NULL)
return 0;
send_length = ETH_ZLEN;
}
/* Mask interrupts from the ethercard. /* Mask interrupts from the ethercard.
SMP: We have to grab the lock here otherwise the IRQ handler SMP: We have to grab the lock here otherwise the IRQ handler
...@@ -298,8 +303,6 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -298,8 +303,6 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
ei_local->irqlock = 1; ei_local->irqlock = 1;
send_length = ETH_ZLEN < length ? length : ETH_ZLEN;
/* /*
* We have two Tx slots available for use. Find the first free * We have two Tx slots available for use. Find the first free
* slot, and then perform some sanity checks. With two Tx bufs, * slot, and then perform some sanity checks. With two Tx bufs,
...@@ -344,13 +347,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -344,13 +347,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* trigger the send later, upon receiving a Tx done interrupt. * trigger the send later, upon receiving a Tx done interrupt.
*/ */
if (length == send_length) ei_block_output(dev, send_length, skb->data, output_page);
ei_block_output(dev, length, skb->data, output_page);
else {
memset(scratch, 0, ETH_ZLEN);
memcpy(scratch, skb->data, skb->len);
ei_block_output(dev, ETH_ZLEN, scratch, output_page);
}
if (! ei_local->txing) if (! ei_local->txing)
{ {
......
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