[patch] patch to build against 3.2.0

264-kernel-3.2.patch (text/plain), 2.28 KB, created by Ognian Tenchev on 2012-01-05 06:11:05 UTC

diff -Naur work/vmnet-only/filter.c work.p/vmnet-only/filter.c
--- work/vmnet-only/filter.c	2011-11-14 08:13:15.000000000 +0200
+++ /tmp/work/vmnet-only/filter.c	2012-01-05 07:31:08.000000000 +0200
@@ -18,6 +18,7 @@
 #include "driver-config.h"
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/version.h>
 #include <linux/socket.h>
 #include <linux/if_ether.h>
diff -Naur work/vmnet-only/kmap_skb.h work.p/vmnet-only/kmap_skb.h
--- work/vmnet-only/kmap_skb.h	1970-01-01 02:00:00.000000000 +0200
+++ /tmp/work/vmnet-only/kmap_skb.h	2012-01-05 07:30:25.000000000 +0200
@@ -0,0 +1,19 @@
+#include <linux/highmem.h>
+
+static inline void *kmap_skb_frag(const skb_frag_t *frag)
+{
+#ifdef CONFIG_HIGHMEM
+        BUG_ON(in_irq());
+
+        local_bh_disable();
+#endif
+        return kmap_atomic(skb_frag_page(frag), KM_SKB_DATA_SOFTIRQ);
+}
+
+static inline void kunmap_skb_frag(void *vaddr)
+{
+        kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+#ifdef CONFIG_HIGHMEM
+        local_bh_enable();
+#endif
+}
diff -Naur work/vmnet-only/netif.c work.p/vmnet-only/netif.c
--- work/vmnet-only/netif.c	2011-11-14 08:13:15.000000000 +0200
+++ /tmp/work/vmnet-only/netif.c	2012-01-05 07:28:37.000000000 +0200
@@ -131,7 +131,7 @@
       .ndo_stop = VNetNetifClose,
       .ndo_get_stats = VNetNetifGetStats,
       .ndo_set_mac_address = VNetNetifSetMAC,
-      .ndo_set_multicast_list = VNetNetifSetMulticast,
+      .ndo_set_rx_mode = VNetNetifSetMulticast,
       /*
        * We cannot stuck... If someone will report problems under
        * low memory conditions or some such, we should enable it.
diff -Naur work/vmnet-only/userif.c /tmp/work/vmnet-only/userif.c
--- work/vmnet-only/userif.c	2011-11-14 08:13:15.000000000 +0200
+++ /tmp/work/vmnet-only/userif.c	2012-01-05 07:29:16.000000000 +0200
@@ -49,6 +49,8 @@
 #include "vm_assert.h"
 #include "monitorAction_exported.h"
 
+#include "kmap_skb.h"
+
 typedef struct VNetUserIFStats {
    unsigned    read;
    unsigned    written;
@@ -517,10 +519,10 @@
 	 unsigned int tmpCsum;
-	 const void *vaddr;
+	 void *vaddr;
 
-	 vaddr = kmap(frag->page);
+	 vaddr = kmap_skb_frag(frag);
 	 tmpCsum = csum_and_copy_to_user(vaddr + frag->page_offset,
 					 curr, frag->size, 0, &err);
-	 kunmap(frag->page);
+	 kunmap_skb_frag(vaddr);
 	 if (err) {
 	    return err;
 	 }