diff options
Diffstat (limited to 'drivers/net/7990.c')
-rw-r--r-- | drivers/net/7990.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 1b3d11ed6cff..d396f996af57 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
@@ -331,7 +331,6 @@ static int lance_rx (struct net_device *dev) | |||
331 | return 0; | 331 | return 0; |
332 | } | 332 | } |
333 | 333 | ||
334 | skb->dev = dev; | ||
335 | skb_reserve (skb, 2); /* 16 byte align */ | 334 | skb_reserve (skb, 2); /* 16 byte align */ |
336 | skb_put (skb, len); /* make room */ | 335 | skb_put (skb, len); /* make room */ |
337 | eth_copy_and_sum(skb, | 336 | eth_copy_and_sum(skb, |
@@ -568,7 +567,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) | |||
568 | 567 | ||
569 | if (skb->len < ETH_ZLEN) | 568 | if (skb->len < ETH_ZLEN) |
570 | memset((char *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); | 569 | memset((char *)&ib->tx_buf[entry][0], 0, ETH_ZLEN); |
571 | memcpy ((char *)&ib->tx_buf [entry][0], skb->data, skblen); | 570 | skb_copy_from_linear_data(skb, &ib->tx_buf[entry][0], skblen); |
572 | 571 | ||
573 | /* Now, give the packet to the lance */ | 572 | /* Now, give the packet to the lance */ |
574 | ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); | 573 | ib->btx_ring [entry].tmd1_bits = (LE_T1_POK|LE_T1_OWN); |