From 8f53d2c379218f155e645f9d1fd3f78073c2bf6c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 4 Sep 2014 15:26:39 +0200
Subject: [vanilla-kernel] New Module

---
 .../patches/vmnet__3.13-3.13__1.0-10.0.2.patch     | 27 ++++++++++++++++++++++
 .../patches/vmnet__3.13-9.9__1.0-10.0.2.patch      | 27 ++++++++++++++++++++++
 .../patches/vmnet__3.13-9.9__1.0-100.0.patch       | 27 ----------------------
 3 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 remote/modules/vmware/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
 create mode 100644 remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch
 delete mode 100644 remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-100.0.patch

(limited to 'remote/modules/vmware')

diff --git a/remote/modules/vmware/patches/vmnet__3.13-3.13__1.0-10.0.2.patch b/remote/modules/vmware/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
new file mode 100644
index 00000000..54607506
--- /dev/null
+++ b/remote/modules/vmware/patches/vmnet__3.13-3.13__1.0-10.0.2.patch
@@ -0,0 +1,27 @@
+--- a/filter.c	2014-04-17 05:30:43.497846349 -0700
++++ b/filter.c	2014-04-17 05:30:41.445846394 -0700
+@@ -203,7 +203,11 @@
+ #endif
+ 
+ static unsigned int
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum,                 // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+                  struct sk_buff *skb,                  // IN:
+ #else
+@@ -252,7 +256,11 @@
+ 
+    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+ 
+    packetHeader = compat_skb_network_header(skb);
+    ip = (struct iphdr*)packetHeader;
diff --git a/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch b/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch
new file mode 100644
index 00000000..54607506
--- /dev/null
+++ b/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-10.0.2.patch
@@ -0,0 +1,27 @@
+--- a/filter.c	2014-04-17 05:30:43.497846349 -0700
++++ b/filter.c	2014-04-17 05:30:41.445846394 -0700
+@@ -203,7 +203,11 @@
+ #endif
+ 
+ static unsigned int
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ VNetFilterHookFn(unsigned int hooknum,                 // IN:
++#else
++VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
++#endif
+ #ifdef VMW_NFHOOK_USES_SKB
+                  struct sk_buff *skb,                  // IN:
+ #else
+@@ -252,7 +256,11 @@
+ 
+    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
+    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
+-   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
++      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
++   #else
++      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
++   #endif
+ 
+    packetHeader = compat_skb_network_header(skb);
+    ip = (struct iphdr*)packetHeader;
diff --git a/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-100.0.patch b/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-100.0.patch
deleted file mode 100644
index 54607506..00000000
--- a/remote/modules/vmware/patches/vmnet__3.13-9.9__1.0-100.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/filter.c	2014-04-17 05:30:43.497846349 -0700
-+++ b/filter.c	2014-04-17 05:30:41.445846394 -0700
-@@ -203,7 +203,11 @@
- #endif
- 
- static unsigned int
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- VNetFilterHookFn(unsigned int hooknum,                 // IN:
-+#else
-+VNetFilterHookFn(const struct nf_hook_ops *ops,        // IN:
-+#endif
- #ifdef VMW_NFHOOK_USES_SKB
-                  struct sk_buff *skb,                  // IN:
- #else
-@@ -252,7 +256,11 @@
- 
-    /* When the host transmits, hooknum is VMW_NF_INET_POST_ROUTING. */
-    /* When the host receives, hooknum is VMW_NF_INET_LOCAL_IN. */
--   transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+   #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+      transmit = (hooknum == VMW_NF_INET_POST_ROUTING);
-+   #else
-+      transmit = (ops->hooknum == VMW_NF_INET_POST_ROUTING);
-+   #endif
- 
-    packetHeader = compat_skb_network_header(skb);
-    ip = (struct iphdr*)packetHeader;
-- 
cgit v1.2.3-55-g7522