Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

[linux-2.6-microblaze.git] / drivers / net / hyperv / rndis_filter.c

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 12ad471..b22e47b 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -25,7 +25,7 @@
 
 static void rndis_set_multicast(struct work_struct *w);
 
-#define RNDIS_EXT_LEN PAGE_SIZE
+#define RNDIS_EXT_LEN HV_HYP_PAGE_SIZE
 struct rndis_request {
        struct list_head list_ent;
        struct completion  wait_event;
@@ -215,18 +215,17 @@ static int rndis_filter_send_request(struct rndis_device *dev,
        packet->page_buf_cnt = 1;
 
        pb[0].pfn = virt_to_phys(&req->request_msg) >>
-                                       PAGE_SHIFT;
+                                       HV_HYP_PAGE_SHIFT;
        pb[0].len = req->request_msg.msg_len;
-       pb[0].offset =
-               (unsigned long)&req->request_msg & (PAGE_SIZE - 1);
+       pb[0].offset = offset_in_hvpage(&req->request_msg);
 
        /* Add one page_buf when request_msg crossing page boundary */
-       if (pb[0].offset + pb[0].len > PAGE_SIZE) {
+       if (pb[0].offset + pb[0].len > HV_HYP_PAGE_SIZE) {
                packet->page_buf_cnt++;
-               pb[0].len = PAGE_SIZE -
+               pb[0].len = HV_HYP_PAGE_SIZE -
                        pb[0].offset;
                pb[1].pfn = virt_to_phys((void *)&req->request_msg
-                       + pb[0].len) >> PAGE_SHIFT;
+                       + pb[0].len) >> HV_HYP_PAGE_SHIFT;
                pb[1].offset = 0;
                pb[1].len = req->request_msg.msg_len -
                        pb[0].len;