X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fni52.c;h=5e7999db2096a69cd0e67bdaae38de4a72868889;hb=5f08e46b621a769e52a9545a23ab1d5fb2aec1d4;hp=a6f4b24b017660a1811c9ccf68a5c56b963af4ce;hpb=9f6632d6290785caf9e9f874c0a0cfaf2c178e59;p=linux-2.6

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index a6f4b24b01..5e7999db20 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -934,10 +934,9 @@ static void ni52_rcv_int(struct net_device *dev)
 					skb = (struct sk_buff *) dev_alloc_skb(totlen+2);
 					if(skb != NULL)
 					{
-						skb->dev = dev;
 						skb_reserve(skb,2);
 						skb_put(skb,totlen);
-						eth_copy_and_sum(skb,(char *) p->base+(unsigned long) rbd->buffer,totlen,0);
+						skb_copy_to_linear_data(skb,(char *) p->base+(unsigned long) rbd->buffer,totlen);
 						skb->protocol=eth_type_trans(skb,dev);
 						netif_rx(skb);
 						dev->last_rx = jiffies;
@@ -1183,7 +1182,7 @@ static int ni52_send_packet(struct sk_buff *skb, struct net_device *dev)
 	else
 #endif
 	{
-		memcpy((char *)p->xmit_cbuffs[p->xmit_count],(char *)(skb->data),skb->len);
+		skb_copy_from_linear_data(skb, (char *) p->xmit_cbuffs[p->xmit_count], skb->len);
 		len = skb->len;
 		if (len < ETH_ZLEN) {
 			len = ETH_ZLEN;