* [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration
@ 2010-12-21 14:02 luciano.coelho
2010-12-21 14:07 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: luciano.coelho @ 2010-12-21 14:02 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, Luciano Coelho, Johannes Berg
From: Luciano Coelho <luciano.coelho@nokia.com>
If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
set.
This patch adds ifdefs around the tpt_led_trigger declaration in
ieee80211_i.h to avoid the problem.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
---
net/mac80211/ieee80211_i.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 0817ec6..7541d42 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -631,6 +631,7 @@ enum queue_stop_reason {
IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
};
+#ifdef CONFIG_MAC80211_LEDS
struct tpt_led_trigger {
struct led_trigger trig;
char name[32];
@@ -642,6 +643,7 @@ struct tpt_led_trigger {
unsigned int active, want;
bool running;
};
+#endif
/**
* mac80211 scan flags - currently active scan mode
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration
2010-12-21 14:02 [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration luciano.coelho
@ 2010-12-21 14:07 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2010-12-21 14:07 UTC (permalink / raw)
To: luciano.coelho; +Cc: linville, linux-wireless
On Tue, 2010-12-21 at 16:02 +0200, luciano.coelho@nokia.com wrote:
> From: Luciano Coelho <luciano.coelho@nokia.com>
>
> If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
> because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
> set.
>
> This patch adds ifdefs around the tpt_led_trigger declaration in
> ieee80211_i.h to avoid the problem.
>
> Cc: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
> ---
> net/mac80211/ieee80211_i.h | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
> index 0817ec6..7541d42 100644
> --- a/net/mac80211/ieee80211_i.h
> +++ b/net/mac80211/ieee80211_i.h
> @@ -631,6 +631,7 @@ enum queue_stop_reason {
> IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
> };
>
> +#ifdef CONFIG_MAC80211_LEDS
> struct tpt_led_trigger {
> struct led_trigger trig;
> char name[32];
> @@ -642,6 +643,7 @@ struct tpt_led_trigger {
> unsigned int active, want;
> bool running;
> };
> +#endif
>
> /**
> * mac80211 scan flags - currently active scan mode
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-21 14:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-21 14:02 [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration luciano.coelho
2010-12-21 14:07 ` Johannes Berg
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).