[PATCH 02/13] backports: fix build if CPTCFG_IEEE802154_6LOWPAN=m

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



CPTCFG_IEEE802154_6LOWPAN is only defined when it is set to be build
into the kernel, which is not possible in backprots, when it is build
as a module CPTCFG_IEEE802154_6LOWPAN_MODULE is set and this should be
checked with IS_ENABLED().

This fixes commit:
commit 66fffbc48eeb256d7a3147cffd491a60a655b136
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Mon May 5 14:46:11 2014 +0200

    backports: provide net_ieee802154_lowpan only when needed

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 backport/backport-include/net/net_namespace.h | 2 +-
 backport/compat/backport-3.15.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backport/backport-include/net/net_namespace.h b/backport/backport-include/net/net_namespace.h
index ad0f030..17c9d55 100644
--- a/backport/backport-include/net/net_namespace.h
+++ b/backport/backport-include/net/net_namespace.h
@@ -3,7 +3,7 @@
 
 #include_next <net/net_namespace.h>
 
-#ifdef CPTCFG_IEEE802154_6LOWPAN
+#if IS_ENABLED(CPTCFG_IEEE802154_6LOWPAN)
 #include <linux/version.h>
 #include <net/netns/ieee802154_6lowpan.h>
 
diff --git a/backport/compat/backport-3.15.c b/backport/compat/backport-3.15.c
index 3492260..5732fa9 100644
--- a/backport/compat/backport-3.15.c
+++ b/backport/compat/backport-3.15.c
@@ -15,7 +15,7 @@
 #include <linux/string.h>
 #include <net/net_namespace.h>
 
-#ifdef CPTCFG_IEEE802154_6LOWPAN
+#if IS_ENABLED(CPTCFG_IEEE802154_6LOWPAN)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
 /* the above kernel dependency is set to match the dependencies file */
 struct netns_ieee802154_lowpan ieee802154_lowpan;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux