* [PATCH] compat-wireless: build led support conditionally
@ 2010-12-22 18:10 Hauke Mehrtens
2010-12-22 18:23 ` Luis R. Rodriguez
2010-12-22 22:57 ` Luis R. Rodriguez
0 siblings, 2 replies; 6+ messages in thread
From: Hauke Mehrtens @ 2010-12-22 18:10 UTC (permalink / raw)
To: lrodriguez; +Cc: linux-wireless, mcgrof, Hauke Mehrtens
Do not build compat-wireless with LED support when the kernel does not
contain a led subsystem.
This fixes some compile problems when CONFIG_LEDS_TRIGGERS is not set.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/config.mk b/config.mk
index 964c646..1f95908 100644
--- a/config.mk
+++ b/config.mk
@@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
CONFIG_MAC80211_RC_PID=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
+ifdef CONFIG_LEDS_TRIGGERS
CONFIG_MAC80211_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
# enable mesh networking too
CONFIG_MAC80211_MESH=y
@@ -243,7 +245,9 @@ CONFIG_B43_PCI_AUTOSELECT=y
ifdef CONFIG_PCMCIA
CONFIG_B43_PCMCIA=y
endif #CONFIG_PCMCIA
+ifdef CONFIG_MAC80211_LEDS
CONFIG_B43_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
# CONFIG_B43_FORCE_PIO=y
@@ -252,7 +256,9 @@ CONFIG_B43_PHY_N=y
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+ifdef CONFIG_MAC80211_LEDS
CONFIG_B43LEGACY_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
@@ -408,18 +414,24 @@ endif #CONFIG_COMPAT_KERNEL_29
CONFIG_P54_USB=m
CONFIG_RTL8187=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_RTL8187_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_AT76C50X_USB=m
ifndef CONFIG_COMPAT_KERNEL_28
CONFIG_AR9170_USB=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_AR9170_LEDS=y
+endif #CONFIG_MAC80211_LEDS
endif #CONFIG_COMPAT_KERNEL_28
ifndef CONFIG_COMPAT_KERNEL_29
CONFIG_CARL9170=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_CARL9170_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# CONFIG_CARL9170_DEBUGFS=y
# CONFIG_CARL9170_WPC=y
endif #CONFIG_COMPAT_KERNEL_29
@@ -559,7 +571,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y
ifdef CONFIG_COMPAT_KERNEL_25
CONFIG_RT2X00_LIB_LEDS=n
else #CONFIG_COMPAT_KERNEL_25
+ifdef CONFIG_LEDS_CLASS
CONFIG_RT2X00_LIB_LEDS=y
+endif #CONFIG_LEDS_CLASS
endif #CONFIG_COMPAT_KERNEL_25
# CONFIG_RT2X00_DEBUG=y
# CONFIG_RT2X00_LIB_DEBUGFS
@@ -567,7 +581,9 @@ endif
# p54
CONFIG_P54_COMMON=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_P54_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# Atheros
CONFIG_ATH_COMMON=m
@@ -594,7 +610,9 @@ endif #CONFIG_COMPAT_KERNEL_27
# In more recent kernel versions use the in kernel rfkill module.
ifdef CONFIG_COMPAT_KERNEL_31
CONFIG_RFKILL_BACKPORT=m
+ifdef CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_INPUT=y
endif #CONFIG_COMPAT_KERNEL_31
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] compat-wireless: build led support conditionally
2010-12-22 18:10 [PATCH] compat-wireless: build led support conditionally Hauke Mehrtens
@ 2010-12-22 18:23 ` Luis R. Rodriguez
2010-12-22 18:31 ` Luis R. Rodriguez
2010-12-22 18:47 ` Hauke Mehrtens
2010-12-22 22:57 ` Luis R. Rodriguez
1 sibling, 2 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2010-12-22 18:23 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless, mcgrof, Luis R. Rodriguez
On Wed, Dec 22, 2010 at 1:10 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> diff --git a/config.mk b/config.mk
> index 964c646..1f95908 100644
> --- a/config.mk
> +++ b/config.mk
> @@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
> CONFIG_MAC80211_RC_PID=y
> CONFIG_MAC80211_RC_MINSTREL=y
> CONFIG_MAC80211_RC_MINSTREL_HT=y
> +ifdef CONFIG_LEDS_TRIGGERS
> CONFIG_MAC80211_LEDS=y
> +endif #CONFIG_LEDS_TRIGGERS
Without using a space for the ifdef'd variable the
include/linux/compat_autoconf.h will end up still defining it but you
should not get it set on the local Makefiles, in this case we want it
to not be defined in the compat_autoconf.h as well so how about
instead (handing off to my atheros address as I use mutt there, one
second)
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat-wireless: build led support conditionally
2010-12-22 18:23 ` Luis R. Rodriguez
@ 2010-12-22 18:31 ` Luis R. Rodriguez
2010-12-22 18:47 ` Hauke Mehrtens
1 sibling, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2010-12-22 18:31 UTC (permalink / raw)
To: Hauke Mehrtens
Cc: linux-wireless@vger.kernel.org, mcgrof@infradead.org,
Luis Rodriguez
On Wed, Dec 22, 2010 at 10:23:48AM -0800, Luis R. Rodriguez wrote:
> On Wed, Dec 22, 2010 at 1:10 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> > diff --git a/config.mk b/config.mk
> > index 964c646..1f95908 100644
> > --- a/config.mk
> > +++ b/config.mk
> > @@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
> > CONFIG_MAC80211_RC_PID=y
> > CONFIG_MAC80211_RC_MINSTREL=y
> > CONFIG_MAC80211_RC_MINSTREL_HT=y
> > +ifdef CONFIG_LEDS_TRIGGERS
> > CONFIG_MAC80211_LEDS=y
> > +endif #CONFIG_LEDS_TRIGGERS
>
> Without using a space for the ifdef'd variable the
> include/linux/compat_autoconf.h will end up still defining it but you
> should not get it set on the local Makefiles, in this case we want it
> to not be defined in the compat_autoconf.h as well so how about
> instead (handing off to my atheros address as I use mutt there, one
> second)
>From 47d9c7d253a7b2a78af69f0d8177ee55df74ea0e Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 22 Dec 2010 19:10:34 +0100
Subject: [PATCH] compat-wireless: build led support conditionally
Do not build compat-wireless with LED support when the kernel does not
contain a led subsystem.
This fixes some compile problems when CONFIG_LEDS_TRIGGERS is not set.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
config.mk | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/config.mk b/config.mk
index 964c646..3a38d34 100644
--- a/config.mk
+++ b/config.mk
@@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
CONFIG_MAC80211_RC_PID=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_LEDS=y
+ifdef CONFIG_LEDS_TRIGGERS
+ CONFIG_MAC80211_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
# enable mesh networking too
CONFIG_MAC80211_MESH=y
@@ -243,7 +245,9 @@ CONFIG_B43_PCI_AUTOSELECT=y
ifdef CONFIG_PCMCIA
CONFIG_B43_PCMCIA=y
endif #CONFIG_PCMCIA
-CONFIG_B43_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_B43_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_B43_PHY_LP=y
CONFIG_B43_PHY_N=y
# CONFIG_B43_FORCE_PIO=y
@@ -252,7 +256,9 @@ CONFIG_B43_PHY_N=y
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_B43LEGACY_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
@@ -408,18 +414,24 @@ endif #CONFIG_COMPAT_KERNEL_29
CONFIG_P54_USB=m
CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_RTL8187_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_AT76C50X_USB=m
ifndef CONFIG_COMPAT_KERNEL_28
CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_AR9170_LEDS=y
+endif #CONFIG_MAC80211_LEDS
endif #CONFIG_COMPAT_KERNEL_28
ifndef CONFIG_COMPAT_KERNEL_29
CONFIG_CARL9170=m
-CONFIG_CARL9170_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_CARL9170_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# CONFIG_CARL9170_DEBUGFS=y
# CONFIG_CARL9170_WPC=y
endif #CONFIG_COMPAT_KERNEL_29
@@ -559,7 +571,9 @@ CONFIG_RT2X00_LIB_CRYPTO=y
ifdef CONFIG_COMPAT_KERNEL_25
CONFIG_RT2X00_LIB_LEDS=n
else #CONFIG_COMPAT_KERNEL_25
-CONFIG_RT2X00_LIB_LEDS=y
+ifdef CONFIG_LEDS_CLASS
+ CONFIG_RT2X00_LIB_LEDS=y
+endif #CONFIG_LEDS_CLASS
endif #CONFIG_COMPAT_KERNEL_25
# CONFIG_RT2X00_DEBUG=y
# CONFIG_RT2X00_LIB_DEBUGFS
@@ -567,7 +581,9 @@ endif
# p54
CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
+ifdef CONFIG_MAC80211_LEDS
+ CONFIG_P54_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# Atheros
CONFIG_ATH_COMMON=m
@@ -594,7 +610,9 @@ endif #CONFIG_COMPAT_KERNEL_27
# In more recent kernel versions use the in kernel rfkill module.
ifdef CONFIG_COMPAT_KERNEL_31
CONFIG_RFKILL_BACKPORT=m
-CONFIG_RFKILL_BACKPORT_LEDS=y
+ifdef CONFIG_LEDS_TRIGGERS
+ CONFIG_RFKILL_BACKPORT_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_INPUT=y
endif #CONFIG_COMPAT_KERNEL_31
--
1.7.3.2.90.gd4c43
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] compat-wireless: build led support conditionally
2010-12-22 18:23 ` Luis R. Rodriguez
2010-12-22 18:31 ` Luis R. Rodriguez
@ 2010-12-22 18:47 ` Hauke Mehrtens
2010-12-22 18:57 ` Luis R. Rodriguez
1 sibling, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2010-12-22 18:47 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-wireless, mcgrof, Luis R. Rodriguez
On 12/22/2010 07:23 PM, Luis R. Rodriguez wrote:
> On Wed, Dec 22, 2010 at 1:10 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> diff --git a/config.mk b/config.mk
>> index 964c646..1f95908 100644
>> --- a/config.mk
>> +++ b/config.mk
>> @@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
>> CONFIG_MAC80211_RC_PID=y
>> CONFIG_MAC80211_RC_MINSTREL=y
>> CONFIG_MAC80211_RC_MINSTREL_HT=y
>> +ifdef CONFIG_LEDS_TRIGGERS
>> CONFIG_MAC80211_LEDS=y
>> +endif #CONFIG_LEDS_TRIGGERS
>
> Without using a space for the ifdef'd variable the
> include/linux/compat_autoconf.h will end up still defining it but you
> should not get it set on the local Makefiles, in this case we want it
> to not be defined in the compat_autoconf.h as well so how about
> instead (handing off to my atheros address as I use mutt there, one
> second)
The script generating include/linux/compat_autoconf.h will also add the
ifdefs into compat_autoconf.h. The generated entry looks like this:
#if defined(CONFIG_LEDS_TRIGGERS) || defined(CONFIG_LEDS_TRIGGERS_MODULE)
#ifndef CONFIG_MAC80211_LEDS
#define CONFIG_MAC80211_LEDS 1
#endif /* CONFIG_MAC80211_LEDS */
#endif /* CONFIG_LEDS_TRIGGERS */
I added this feature some months ago.
Hauke
Your mail server at atheros did not accept my mail, because the IP
address I got from my local ISP ( 91.97.249.71 ) is on some blacklist.
But this is normal and the mail was sent throught my mail server which
IP address is not on that blacklist. Your mail server seams to be mis
configured.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat-wireless: build led support conditionally
2010-12-22 18:47 ` Hauke Mehrtens
@ 2010-12-22 18:57 ` Luis R. Rodriguez
0 siblings, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2010-12-22 18:57 UTC (permalink / raw)
To: Hauke Mehrtens
Cc: Luis Rodriguez, linux-wireless@vger.kernel.org,
mcgrof@infradead.org, it
On Wed, Dec 22, 2010 at 10:47:30AM -0800, Hauke Mehrtens wrote:
> On 12/22/2010 07:23 PM, Luis R. Rodriguez wrote:
> > On Wed, Dec 22, 2010 at 1:10 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> >> diff --git a/config.mk b/config.mk
> >> index 964c646..1f95908 100644
> >> --- a/config.mk
> >> +++ b/config.mk
> >> @@ -133,7 +133,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
> >> CONFIG_MAC80211_RC_PID=y
> >> CONFIG_MAC80211_RC_MINSTREL=y
> >> CONFIG_MAC80211_RC_MINSTREL_HT=y
> >> +ifdef CONFIG_LEDS_TRIGGERS
> >> CONFIG_MAC80211_LEDS=y
> >> +endif #CONFIG_LEDS_TRIGGERS
> >
> > Without using a space for the ifdef'd variable the
> > include/linux/compat_autoconf.h will end up still defining it but you
> > should not get it set on the local Makefiles, in this case we want it
> > to not be defined in the compat_autoconf.h as well so how about
> > instead (handing off to my atheros address as I use mutt there, one
> > second)
>
> The script generating include/linux/compat_autoconf.h will also add the
> ifdefs into compat_autoconf.h. The generated entry looks like this:
>
> #if defined(CONFIG_LEDS_TRIGGERS) || defined(CONFIG_LEDS_TRIGGERS_MODULE)
> #ifndef CONFIG_MAC80211_LEDS
> #define CONFIG_MAC80211_LEDS 1
> #endif /* CONFIG_MAC80211_LEDS */
> #endif /* CONFIG_LEDS_TRIGGERS */
>
> I added this feature some months ago.
Ah neat thanks!
> Hauke
>
> Your mail server at atheros did not accept my mail, because the IP
> address I got from my local ISP ( 91.97.249.71 ) is on some blacklist.
> But this is normal and the mail was sent throught my mail server which
> IP address is not on that blacklist. Your mail server seams to be mis
> configured.
Cc'ing our IT.
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] compat-wireless: build led support conditionally
2010-12-22 18:10 [PATCH] compat-wireless: build led support conditionally Hauke Mehrtens
2010-12-22 18:23 ` Luis R. Rodriguez
@ 2010-12-22 22:57 ` Luis R. Rodriguez
1 sibling, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2010-12-22 22:57 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless, mcgrof
On Wed, Dec 22, 2010 at 1:10 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Do not build compat-wireless with LED support when the kernel does not
> contain a led subsystem.
> This fixes some compile problems when CONFIG_LEDS_TRIGGERS is not set.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Patch applied and pushed, thanks!
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-22 22:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-22 18:10 [PATCH] compat-wireless: build led support conditionally Hauke Mehrtens
2010-12-22 18:23 ` Luis R. Rodriguez
2010-12-22 18:31 ` Luis R. Rodriguez
2010-12-22 18:47 ` Hauke Mehrtens
2010-12-22 18:57 ` Luis R. Rodriguez
2010-12-22 22:57 ` Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).