[patch] make vmnet-only/driver.c compatible with kernel 3.0.4

vmnet-driver.patch (text/plain), 1.81 KB, created by Alex Efros on 2011-12-06 20:27:05 UTC

diff -uNr vmnet-only.orig/driver.c vmnet-only/driver.c
--- vmnet-only.orig/driver.c	2011-12-06 21:50:37.000000000 +0200
+++ vmnet-only/driver.c	2011-12-06 22:00:43.000000000 +0200
@@ -165,7 +165,27 @@
                                      unsigned int iocmd, unsigned long ioarg);
 #endif
 
-static struct file_operations vnetFileOps;
+/*
+ * Moved file operations initialize here because of incompatibilites
+ * with Gentoo hardened profile/hardend Linux 3.
+ */
+static struct file_operations vnetFileOps = {
+    .owner = THIS_MODULE,
+    .read = VNetFileOpRead,
+    .write = VNetFileOpWrite,
+    .poll = VNetFileOpPoll,
+#ifdef HAVE_UNLOCKED_IOCTL
+    .unlocked_ioctl = VNetFileOpUnlockedIoctl,
+#else
+    .ioctl = VNetFileOpIoctl,
+#endif
+#ifdef HAVE_COMPAT_IOCTL
+    .compat_ioctl = VNetFileOpUnlockedIoctl,
+#endif
+    .open = VNetFileOpOpen,
+    .release = VNetFileOpClose,
+};
+
 
 /*
  * Utility functions
@@ -476,28 +496,6 @@
       goto err_proto;
    }
 
-   /*
-    * Initialize the file_operations structure. Because this code is always
-    * compiled as a module, this is fine to do it here and not in a static
-    * initializer.
-    */
-
-   memset(&vnetFileOps, 0, sizeof vnetFileOps);
-   vnetFileOps.owner = THIS_MODULE;
-   vnetFileOps.read = VNetFileOpRead;
-   vnetFileOps.write = VNetFileOpWrite;
-   vnetFileOps.poll = VNetFileOpPoll;
-#ifdef HAVE_UNLOCKED_IOCTL
-   vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
-#else
-   vnetFileOps.ioctl = VNetFileOpIoctl;
-#endif
-#ifdef HAVE_COMPAT_IOCTL
-   vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
-#endif
-   vnetFileOps.open = VNetFileOpOpen;
-   vnetFileOps.release = VNetFileOpClose;
-
    retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
    if (retval) {
       LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",