diff options
Diffstat (limited to 'drivers/net/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index a3843320dbe1..0fe96c85828b 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
| @@ -988,7 +988,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 988 | if (lance_debug > 5) | 988 | if (lance_debug > 5) |
| 989 | printk("%s: bouncing a high-memory packet (%#x).\n", | 989 | printk("%s: bouncing a high-memory packet (%#x).\n", |
| 990 | dev->name, (u32)isa_virt_to_bus(skb->data)); | 990 | dev->name, (u32)isa_virt_to_bus(skb->data)); |
| 991 | memcpy(&lp->tx_bounce_buffs[entry], skb->data, skb->len); | 991 | skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len); |
| 992 | lp->tx_ring[entry].base = | 992 | lp->tx_ring[entry].base = |
| 993 | ((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000; | 993 | ((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000; |
| 994 | dev_kfree_skb(skb); | 994 | dev_kfree_skb(skb); |
| @@ -1184,7 +1184,6 @@ lance_rx(struct net_device *dev) | |||
| 1184 | } | 1184 | } |
| 1185 | break; | 1185 | break; |
| 1186 | } | 1186 | } |
| 1187 | skb->dev = dev; | ||
| 1188 | skb_reserve(skb,2); /* 16 byte align */ | 1187 | skb_reserve(skb,2); /* 16 byte align */ |
| 1189 | skb_put(skb,pkt_len); /* Make room */ | 1188 | skb_put(skb,pkt_len); /* Make room */ |
| 1190 | eth_copy_and_sum(skb, | 1189 | eth_copy_and_sum(skb, |