patch-2.3.25 linux/drivers/net/es3210.c

• Lines: 34
• Date: Fri Oct 29 13:19:49 1999
• Orig file: v2.3.24/linux/drivers/net/es3210.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.24/linux/drivers/net/es3210.c linux/drivers/net/es3210.c
@@ -321,7 +321,7 @@
 es_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
 {
 	unsigned long hdr_start = dev->mem_start + ((ring_page - ES_START_PG)<<8);
-	memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
+	isa_memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
 	hdr->count = (hdr->count + 3) & ~3;     /* Round up allocation. */
 }
 
@@ -339,12 +339,12 @@
 	if (xfer_start + count > dev->rmem_end) {
 		/* Packet wraps over end of ring buffer. */
 		int semi_count = dev->rmem_end - xfer_start;
-		memcpy_fromio(skb->data, xfer_start, semi_count);
+		isa_memcpy_fromio(skb->data, xfer_start, semi_count);
 		count -= semi_count;
-		memcpy_fromio(skb->data + semi_count, dev->rmem_start, count);
+		isa_memcpy_fromio(skb->data + semi_count, dev->rmem_start, count);
 	} else {
 		/* Packet is in one chunk. */
-		memcpy_fromio(skb->data, xfer_start, count);
+		isa_eth_io_copy_and_csum(skb, xfer_start, count, 0);
 	}
 }
 
@@ -354,7 +354,7 @@
 	unsigned long shmem = dev->mem_start + ((start_page - ES_START_PG)<<8);
 
 	count = (count + 3) & ~3;     /* Round up to doubleword */
-	memcpy_toio(shmem, buf, count);
+	isa_memcpy_toio(shmem, buf, count);
 }
 
 static int es_open(struct net_device *dev)