Added support for SLES11SP3

Signed-off-by: Robert J Woodruff <robert.j.woodruff@intel.com>
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/compat/compat-3.1.c b/compat/compat-3.1.c
index 9251c7d0c2094a9a981c63f41f6293b58f12a745..07bf8d6a960efa63d0963809997d71ee670ae507 100644 (file)
--- a/compat/compat-3.1.c
+++ b/compat/compat-3.1.c
@@ -8,6 +8,7 @@
  * Compatibility file for Linux wireless for kernels 3.1.
  */
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 #if ! defined(RHEL_MINOR) || (RHEL_MINOR < 3)
 #include <linux/idr.h>
 
@@ -82,4 +83,5 @@ void ida_simple_remove(struct ida *ida, unsigned int id)
 EXPORT_SYMBOL(ida_simple_remove);
 /* source lib/idr.c */
 #endif
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 

diff --git a/compat/compat-3.2.c b/compat/compat-3.2.c
index 6e86c1023b9f02fd2e3bf7d89cab44d6f6b27a99..d83f766ebddb2d0d4fd712996a33e1e9f5e27f0c 100644 (file)
--- a/compat/compat-3.2.c
+++ b/compat/compat-3.2.c
@@ -50,7 +50,7 @@ int __ethtool_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 }
 EXPORT_SYMBOL(__ethtool_get_settings);
 
-#ifndef CONFIG_COMPAT_SLES_11_2
+#if (!defined(CONFIG_COMPAT_SLES_11_2) && !defined(CONFIG_COMPAT_SLES_11_3))
 #if !defined(RHEL_MINOR) || (RHEL_MINOR < 3)
 /**
  * llist_add_batch - add several linked entries in batch
@@ -111,5 +111,5 @@ struct llist_node *llist_del_first(struct llist_head *head)
 }
 EXPORT_SYMBOL_GPL(llist_del_first);
 
-#endif /* CONFIG_COMPAT_SLES_11_2 */
+#endif /* (!defined(CONFIG_COMPAT_SLES_11_2) && !defined(CONFIG_COMPAT_SLES_11_3)) */
 #endif

diff --git a/compat/compat-3.4.c b/compat/compat-3.4.c
index de46ac9ae2046c4011f8872c73b6c62a6584ed92..c4146c41d283915ab85817d0a657afca113765a1 100644 (file)
--- a/compat/compat-3.4.c
+++ b/compat/compat-3.4.c
@@ -8,7 +8,7 @@
  * Compatibility file for Linux wireless for kernels 3.4.
  */
 
-#ifndef CONFIG_COMPAT_RHEL_6_4
+#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
 
 #include <linux/fs.h>
 #include <linux/module.h>
@@ -21,4 +21,4 @@ int simple_open(struct inode *inode, struct file *file)
 }
 EXPORT_SYMBOL_GPL(simple_open);
 
-#endif /* CONFIG_COMPAT_RHEL_6_4 */
+#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */

diff --git a/include/linux/compat-3.1.h b/include/linux/compat-3.1.h
index ff80b8874e412f3da4c7f69177fe3990da4ca561..f1a0ba43f6fdc3a43937e535189760e180d50b64 100644 (file)
--- a/include/linux/compat-3.1.h
+++ b/include/linux/compat-3.1.h
@@ -11,6 +11,7 @@
 #include <linux/idr.h>
 #include <net/dst.h>
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 static inline struct neighbour *dst_get_neighbour(struct dst_entry *dst)
 {
        return dst->neighbour;
@@ -25,6 +26,7 @@ static inline struct neighbour *dst_get_neighbour_raw(struct dst_entry *dst)
 {
        return rcu_dereference_raw(dst->neighbour);
 }
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 
 /* Backports 56f8a75c */
 static inline bool ip_is_fragment(const struct iphdr *iph)
@@ -109,9 +111,11 @@ static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
 #include <asm-generic/atomic64.h>
 #endif
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 int ida_simple_get(struct ida *ida, unsigned int start, unsigned int end,
                   gfp_t gfp_mask);
 void ida_simple_remove(struct ida *ida, unsigned int id);
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
 

diff --git a/include/linux/compat-3.2.h b/include/linux/compat-3.2.h
index 69705397a618a42fade8ad701a018d57f9d3bb4a..e9bd8115b65829c1c63a6a2989c738c66a95274d 100644 (file)
--- a/include/linux/compat-3.2.h
+++ b/include/linux/compat-3.2.h
@@ -18,6 +18,7 @@
 extern int __ethtool_get_settings(struct net_device *dev,
                                  struct ethtool_cmd *cmd);
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 #ifdef CONFIG_COMPAT_SKB_FRAG_NEEDED
 
 /**
@@ -134,6 +135,7 @@ static inline char *hex_byte_pack(char *buf, u8 byte)
        *buf++ = hex_asc_lo(byte);
        return buf;
 }
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 
 /* module_platform_driver() - Helper macro for drivers that don't do
  * anything special in module init/exit.  This eliminates a lot of

diff --git a/include/linux/compat-3.3.h b/include/linux/compat-3.3.h
index 5bab8a8d0d70fd1154ca213c2effe722893d449f..337cb6fb65c13c4258b2b20bdc853c7d89a7b66a 100644 (file)
--- a/include/linux/compat-3.3.h
+++ b/include/linux/compat-3.3.h
@@ -40,6 +40,7 @@ static inline void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)
 
 typedef u32 netdev_features_t;
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 /* source include/linux/device.h */
 /**
  * module_driver() - Helper macro for drivers that don't do anything
@@ -94,6 +95,7 @@ static inline void netdev_tx_reset_queue(struct netdev_queue *q)
 }
 
 #define NETIF_F_LOOPBACK       (1 << 31) /* Enable loopback */
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) */
 

diff --git a/include/linux/compat-3.4.h b/include/linux/compat-3.4.h
index fe3fa65c16b719ba70c87ab2cebd747f6c52a5bc..0a42086f7cce5c1ed3e6f13b26fc867cd9e7ce6b 100644 (file)
--- a/include/linux/compat-3.4.h
+++ b/include/linux/compat-3.4.h
@@ -8,7 +8,9 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 
+#ifndef CONFIG_COMPAT_SLES_11_3
 extern int simple_open(struct inode *inode, struct file *file);
+#endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28))
 #define skb_add_rx_frag(skb, i, page, off, size, truesize) \
@@ -57,10 +59,12 @@ static inline void eth_hw_addr_random(struct net_device *dev)
 #endif /* CONFIG_COMPAT_RHEL_6_4 */
 
 #else /* 2.6.36 and on */
+#ifndef CONFIG_COMPAT_SLES_11_3
 static inline void eth_hw_addr_random(struct net_device *dev)
 {
        dev_hw_addr_random(dev, dev->dev_addr);
 }
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */
 
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */

diff --git a/include/linux/compat-3.5.h b/include/linux/compat-3.5.h
index 0a8e7e288bef52860c9f9ad0a04daf33e4f5dc57..72f414bbbb25b27dd65bbea4e00b4ad3ee244d95 100644 (file)
--- a/include/linux/compat-3.5.h
+++ b/include/linux/compat-3.5.h
@@ -21,7 +21,7 @@
  *
  */
 
-#ifndef CONFIG_COMPAT_RHEL_6_4
+#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
 static inline int fault_in_multipages_writeable(char __user *uaddr, int size)
 {
         int ret = 0;
@@ -75,10 +75,11 @@ static inline int fault_in_multipages_readable(const char __user *uaddr,
 
         return ret;
 }
-#endif /* CONFIG_COMPAT_RHEL_6_4 */
+#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */
 
 /* switcheroo is available on >= 2.6.34 */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+#ifndef CONFIG_COMPAT_SLES_11_3
 #include <linux/vga_switcheroo.h>
 /*
  * This backports:
@@ -95,6 +96,7 @@ struct vga_switcheroo_client_ops {
     void (*reprobe)(struct pci_dev *dev);
     bool (*can_switch)(struct pci_dev *dev);
 };
+#endif /* CONFIG_COMPAT_SLES_11_3 */
 #endif
 
 /*

diff --git a/include/linux/llist.h b/include/linux/llist.h
index a2a3742548e39f1c0fde6187d2aea7864d030836..d49d57e6f8d7bda468f572bd4874e74ec70d52a2 100644 (file)
--- a/include/linux/llist.h
+++ b/include/linux/llist.h
@@ -10,7 +10,7 @@ extern bool llist_add_batch(struct llist_node *new_first,
 extern struct llist_node *llist_del_first(struct llist_head *head);
 #else
 
-#ifdef CONFIG_COMPAT_SLES_11_2
+#if (defined(CONFIG_COMPAT_SLES_11_2) || defined(CONFIG_COMPAT_SLES_11_3))
 #include_next <linux/llist.h>
 #else
 
@@ -201,6 +201,6 @@ extern bool llist_add_batch(struct llist_node *new_first,
 
 extern struct llist_node *llist_del_first(struct llist_head *head);
 
-#endif /* CONFIG_COMPAT_SLES_11_2 */
+#endif /* (defined(CONFIG_COMPAT_SLES_11_2) || defined(CONFIG_COMPAT_SLES_11_3)) */
 #endif /* LLIST_H */
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */