File backports-build-fixes-sle12-sp1.diff of Package compat-wireless

Overview Repositories Revisions Requests Users Attributes Meta

File backports-build-fixes-sle12-sp1.diff of Package compat-wireless

--- a/backport-include/linux/skbuff.h
+++ b/backport-include/linux/skbuff.h
@@ -140,6 +140,7 @@ static inline void *skb_frag_address_saf
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) && \
     RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) && \
     !(LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
+#ifndef CONFIG_SUSE_KERNEL
 /*
  * Packet hash types specify the type of hash in skb_set_hash.
  *
@@ -183,6 +184,7 @@ skb_set_hash(struct sk_buff *skb, __u32
 	skb->rxhash = hash;
 #endif
 }
+#endif /* SUSE_KERNEL */
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
--- a/backport-include/linux/u64_stats_sync.h
+++ b/backport-include/linux/u64_stats_sync.h
@@ -116,6 +116,7 @@ static inline bool u64_stats_fetch_retry
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) && \
     !(LINUX_VERSION_CODE == KERNEL_VERSION(3,13,11) && UTS_UBUNTU_RELEASE_ABI > 30)
+#if !(defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
 static inline unsigned int u64_stats_fetch_begin_irq(const struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
@@ -141,6 +142,7 @@ static inline bool u64_stats_fetch_retry
 #endif
 }
 
+#endif /* SLE12-SP1 */
 #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
--- a/backport-include/linux/netdevice.h
+++ b/backport-include/linux/netdevice.h
@@ -21,6 +21,7 @@ struct inet6_dev;
 #include <linux/hardirq.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
+#ifndef CONFIG_SUSE_KERNEL
 /*
  * Backports note: if in-kernel support is provided we could then just
  * take the kernel's implementation of __dev_kfree_skb_irq() as it requires
@@ -80,6 +81,7 @@ static inline void dev_consume_skb_any(s
 {
 	dev_kfree_skb_any(skb);
 }
+#endif /* SUSE_KERNEL */
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) */
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,8)
--- a/backport-include/linux/device.h
+++ b/backport-include/linux/device.h
@@ -62,6 +62,7 @@ extern int devres_release(struct device
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
+#ifndef CONFIG_SUSE_KERNEL
 #include <linux/ratelimit.h>
 
 #define dev_level_ratelimited(dev_level, dev, fmt, ...)			\
@@ -105,6 +106,7 @@ do {									\
 #define dev_dbg_ratelimited(dev, fmt, ...)			\
 	no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 #endif /* dynamic debug */
+#endif /* SUSE_KERNEL */
 #endif /* <= 3.5 */
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(3,6,0)
--- a/backport-include/net/ip.h
+++ b/backport-include/net/ip.h
@@ -4,11 +4,13 @@
 #include <linux/version.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#ifndef CONFIG_SUSE_KERNEL
 /* Backports 56f8a75c */
 static inline bool ip_is_fragment(const struct iphdr *iph)
 {
 	return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0;
 }
+#endif /* SUSE_KERNEL */
 #endif
 
 #endif /* __BACKPORT_NET_IP_H */
--- a/compat/backport-3.13.c
+++ b/compat/backport-3.13.c
@@ -259,6 +259,7 @@ EXPORT_SYMBOL_GPL(pci_device_is_present)
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_HWMON
+#if !(defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
 struct device*
 hwmon_device_register_with_groups(struct device *dev, const char *name,
 				  void *drvdata,
@@ -306,4 +307,5 @@ error:
 	return hwdev;
 }
 EXPORT_SYMBOL_GPL(devm_hwmon_device_register_with_groups);
+#endif /* SUSE_KERNEL */
 #endif
--- a/backport-include/linux/hwmon.h
+++ b/backport-include/linux/hwmon.h
@@ -4,6 +4,7 @@
 #include <linux/version.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
+#if !(defined(CONFIG_SUSE_KERNEL) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
 /*
  * Backports
  *
@@ -29,6 +30,7 @@ struct device *
 devm_hwmon_device_register_with_groups(struct device *dev, const char *name,
 				       void *drvdata,
 				       const struct attribute_group **groups);
+#endif /* SUSE_KERNEL */
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) */
 
 #endif /* __BACKPORT_LINUX_HWMON_H */

Places

File backports-build-fixes-sle12-sp1.diff of Package compat-wireless

Places