backports: do not include net_ieee802154_lowpan in kernel >= 3.16

In kernel >= 3.16 this backport is not needed at all. When
CPTCFG_IEEE802154_6LOWPAN is not set it should not get build, we do not
have to check if we are kernel > 3.5, because in an other case
ieee802.15.4 will not get build. Kernel version 3.15 needs a different
backport than the older versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/backport/backport-include/net/net_namespace.h b/backport/backport-include/net/net_namespace.h
index 17c9d554c9c42b3713a8a0767cd2a18bf06e9531..e83b103c31615d2141d50731d1171624d8eaaa2a 100644 (file)
--- a/backport/backport-include/net/net_namespace.h
+++ b/backport/backport-include/net/net_namespace.h
@@ -7,16 +7,14 @@
 #include <linux/version.h>
 #include <net/netns/ieee802154_6lowpan.h>
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
 /*
  * we provide backport for 6lowpan as per the dependencies file
  * down to 3.5 only.
  */
 extern struct netns_ieee802154_lowpan ieee802154_lowpan;
 struct netns_ieee802154_lowpan *net_ieee802154_lowpan(struct net *net);
-#endif
-#else /* < 3.5..3.14 */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
 /* This can be removed once and if this gets upstream */
 static inline struct netns_ieee802154_lowpan *
 net_ieee802154_lowpan(struct net *net)

diff --git a/backport/compat/backport-3.15.c b/backport/compat/backport-3.15.c
index 5732fa90973ee1b2d4f0fec9564de0dcc816ce12..75216eb990b276364f56b2d61a75a7615ac18c2f 100644 (file)
--- a/backport/compat/backport-3.15.c
+++ b/backport/compat/backport-3.15.c
@@ -16,7 +16,7 @@
 #include <net/net_namespace.h>
 
 #if IS_ENABLED(CPTCFG_IEEE802154_6LOWPAN)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
 /* the above kernel dependency is set to match the dependencies file */
 struct netns_ieee802154_lowpan ieee802154_lowpan;
 EXPORT_SYMBOL_GPL(ieee802154_lowpan);