aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/NetVsc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-29 18:39:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:01:53 -0400
commitfa56d361b07513cba87cc5c2b57f3f51248f89a8 (patch)
treeb07a8b549d3c457637396b873534bc03e7180489 /drivers/staging/hv/NetVsc.c
parent4a66384567dfa68fb0bf6604842b1262e601d4a2 (diff)
Staging: hv: osd: remove physical address wrapper functions
Use the real functions the kernel provides, so that people can see what is actually going on in the code easier. Cc: Bill Pemberton <wfp5p@virginia.edu> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/NetVsc.c')
-rw-r--r--drivers/staging/hv/NetVsc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index 8e71ce6406e..ab71c0ad361 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -23,6 +23,7 @@
23#include <linux/kernel.h> 23#include <linux/kernel.h>
24#include <linux/mm.h> 24#include <linux/mm.h>
25#include <linux/delay.h> 25#include <linux/delay.h>
26#include <asm/io.h>
26#include "include/logging.h" 27#include "include/logging.h"
27#include "NetVsc.h" 28#include "NetVsc.h"
28#include "RndisFilter.h" 29#include "RndisFilter.h"
@@ -1241,13 +1242,13 @@ NetVscOnReceive(
1241 1242
1242 netvscPacket->PageBuffers[0].Length = vmxferpagePacket->Ranges[i].ByteCount; 1243 netvscPacket->PageBuffers[0].Length = vmxferpagePacket->Ranges[i].ByteCount;
1243 1244
1244 start = GetPhysicalAddress((void*)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); 1245 start = virt_to_phys((void*)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset));
1245 1246
1246 netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT; 1247 netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT;
1247 endVirtual = (unsigned long)netDevice->ReceiveBuffer 1248 endVirtual = (unsigned long)netDevice->ReceiveBuffer
1248 + vmxferpagePacket->Ranges[i].ByteOffset 1249 + vmxferpagePacket->Ranges[i].ByteOffset
1249 + vmxferpagePacket->Ranges[i].ByteCount -1; 1250 + vmxferpagePacket->Ranges[i].ByteCount -1;
1250 end = GetPhysicalAddress((void*)endVirtual); 1251 end = virt_to_phys((void*)endVirtual);
1251 1252
1252 /* Calculate the page relative offset */ 1253 /* Calculate the page relative offset */
1253 netvscPacket->PageBuffers[0].Offset = vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE -1); 1254 netvscPacket->PageBuffers[0].Offset = vmxferpagePacket->Ranges[i].ByteOffset & (PAGE_SIZE -1);
@@ -1266,7 +1267,7 @@ NetVscOnReceive(
1266 bytesRemain -= PAGE_SIZE; 1267 bytesRemain -= PAGE_SIZE;
1267 } 1268 }
1268 netvscPacket->PageBuffers[j].Pfn = 1269 netvscPacket->PageBuffers[j].Pfn =
1269 GetPhysicalAddress((void*)(endVirtual - bytesRemain)) >> PAGE_SHIFT; 1270 virt_to_phys((void*)(endVirtual - bytesRemain)) >> PAGE_SHIFT;
1270 netvscPacket->PageBufferCount++; 1271 netvscPacket->PageBufferCount++;
1271 if (bytesRemain == 0) 1272 if (bytesRemain == 0)
1272 break; 1273 break;