1
Description: Add support for kernel 2.6.36
2
Origin: upstream, http://vbox.innotek.de/pipermail/vbox-dev/2010-August/003143.html
4
--- virtualbox-ose-3.2.8-dfsg.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (revision 64881)
5
+++ virtualbox-ose-3.2.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (revision 64882)
8
static int VBoxNetAdpLinuxOpen(struct inode *pInode, struct file *pFilp);
9
static int VBoxNetAdpLinuxClose(struct inode *pInode, struct file *pFilp);
10
-static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, unsigned int uCmd, unsigned long ulArg);
11
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
12
+static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp,
13
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
14
+static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
15
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
16
+ unsigned int uCmd, unsigned long ulArg);
18
/*******************************************************************************
22
open: VBoxNetAdpLinuxOpen,
23
release: VBoxNetAdpLinuxClose,
24
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
25
ioctl: VBoxNetAdpLinuxIOCtl,
26
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
27
+ unlocked_ioctl: VBoxNetAdpLinuxIOCtlUnlocked,
28
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
31
/** The miscdevice structure. */
33
* @param uCmd The function specified to ioctl().
34
* @param ulArg The argument specified to ioctl().
36
-static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, unsigned int uCmd, unsigned long ulArg)
37
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
38
+static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp,
39
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
40
+static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp,
41
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */
42
+ unsigned int uCmd, unsigned long ulArg)