2010-12-21 14:02:54

by Luciano Coelho

Subject: [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration

From: Luciano Coelho <[email protected]>

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 <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
---
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

2010-12-21 14:07:19

by Johannes Berg

Subject: Re: [PATCH] mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration

On Tue, 2010-12-21 at 16:02 +0200, [email protected] wrote:
> From: Luciano Coelho <[email protected]>
>
> 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 <[email protected]>

Acked-by: Johannes Berg <[email protected]>

> Signed-off-by: Luciano Coelho <[email protected]>
> ---
> 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