X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2F3c505.c;h=e985a85a56237b6bccb13ac689a92e061ff418d1;hb=52a9435183f961e1bb3c146a62bfbecf93d15d58;hp=702bfb2a5e99d047f82e6d2b80e46c48396108e2;hpb=e9ccb79927225d8cd8d022a7c09bfb2fad935b89;p=powerpc.git

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 702bfb2a5e..e985a85a56 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -615,7 +615,6 @@ static void receive_packet(struct net_device *dev, int len)
 	if (test_and_set_bit(0, (void *) &adapter->dmaing))
 		printk(KERN_ERR "%s: rx blocked, DMA in progress, dir %d\n", dev->name, adapter->current_dma.direction);
 
-	skb->dev = dev;
 	adapter->current_dma.direction = 0;
 	adapter->current_dma.length = rlen;
 	adapter->current_dma.skb = skb;
@@ -1026,7 +1025,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
 	adapter->current_dma.start_time = jiffies;
 
 	if ((unsigned long)(skb->data + nlen) >= MAX_DMA_ADDRESS || nlen != skb->len) {
-		memcpy(adapter->dma_buffer, skb->data, nlen);
+		skb_copy_from_linear_data(skb, adapter->dma_buffer, nlen);
 		memset(adapter->dma_buffer+skb->len, 0, nlen-skb->len);
 		target = isa_virt_to_bus(adapter->dma_buffer);
 	}