patch-2.2.18 linux/drivers/net/atari_pamsnet.c

• Lines: 27
• Date: Sat Oct 14 00:07:14 2000
• Orig file: v2.2.17/drivers/net/atari_pamsnet.c
• Orig date: Fri Apr 21 12:46:15 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/net/atari_pamsnet.c linux/drivers/net/atari_pamsnet.c
@@ -439,7 +439,7 @@
 	unsigned char *buffer;
 {
 	int ret = -1;
-	unsigned char *vbuffer = (unsigned char *)PTOV(buffer);
+	unsigned char *vbuffer = phys_to_virt((unsigned long)buffer);
 	unsigned char cmd_buffer[5];
 
 	if (send_first(target, INQUIRY))
@@ -487,7 +487,7 @@
 	    !acsi_wait_for_IRQ(TIMEOUTDMA) ||
 	    get_status())
 		goto bad;
-	ret = (HADDR *)PTOV(&(((DMAHWADDR *)buffer)->hwaddr));
+	ret = phys_to_virt(&(((DMAHWADDR *)buffer)->hwaddr));
 	dma_cache_maintenance((unsigned long)buffer, 512, 0);
 bad:
 	return (ret);
@@ -707,7 +707,7 @@
 	}
 	else {
 		int length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
-		unsigned long buf = VTOP(skb->data);
+		unsigned long buf = virt_to_phys(skb->data);
 		int stat;
 
 		stdma_lock(pamsnet_intr, NULL);