Added support for RHEL7.0

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/include/linux/compat-3.11.h b/include/linux/compat-3.11.h
index cb15185dd4b8bb8493dd47d8b1b81e55918f3b98..981ac86d71457cff9c06e19977e8eda52c50aa02 100644 (file)
--- a/include/linux/compat-3.11.h
+++ b/include/linux/compat-3.11.h
@@ -3,7 +3,7 @@
 
 #include <linux/version.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0))
 
 #ifndef AF_IB
 #define AF_IB          27      /* Native InfiniBand address    */
@@ -17,12 +17,14 @@ netdev_notifier_info_to_dev(void *ptr)
        return (struct net_device *)ptr;
 }
 
+#if !defined(CONFIG_COMPAT_IFLA_VF_LINK_STATE_MAX)
 enum {
        IFLA_VF_LINK_STATE_AUTO,        /* link state of the uplink */
        IFLA_VF_LINK_STATE_ENABLE,      /* link always up */
        IFLA_VF_LINK_STATE_DISABLE,     /* link always down */
        __IFLA_VF_LINK_STATE_MAX,
 };
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0) */
+#endif
 
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)) */
 #endif /* LINUX_3_11_COMPAT_H */

diff --git a/include/linux/compat-3.12.h b/include/linux/compat-3.12.h
index 9cf23a9757a2c409506b217e4715e1bc7a06a87f..6406c2c63d079fdae308c10339f5882a839d2d80 100644 (file)
--- a/include/linux/compat-3.12.h
+++ b/include/linux/compat-3.12.h
@@ -11,6 +11,7 @@
 
 #define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)
 
+#define file_inode LINUX_BACKPORT(file_inode)
 static inline struct inode *file_inode(struct file *f)
 {
        return f->f_dentry->d_inode;

diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
deleted file mode 100644 (file)
index 3df402d..0000000
--- a/include/net/busy_poll.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _COMPAT_LINUX_NET_BUSY_POLL_H
-#define _COMPAT_LINUX_NET_BUSY_POLL_H 1
-
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
-#include_next <net/busy_poll.h>
-#endif
-
-#endif /* _COMPAT_LINUX_NET_BUSY_POLL_H */