2012-04-17 23:19:26

by Larry Finger

[permalink] [raw]
Subject: [PATCH] iwlwifi: Fix compile when CONFIG_IWLWIFI_DEBUG is not defined

If CONFIG_IWLWIFI_DEBUG is not defined, the following error results when
compiling iwlwifi:

CC [M] drivers/net/wireless/iwlwifi/iwl-agn-tt.o
In file included from drivers/net/wireless/iwlwifi/iwl-agn-tt.c:40:0:
drivers/net/wireless/iwlwifi/iwl-core.h:97:19: error: static declaration of ‘iwl_alloc_traffic_mem’ follows non-static declaration
drivers/net/wireless/iwlwifi/iwl-agn.h:513:5: note: previous declaration of ‘iwl_alloc_traffic_mem’ was here
make[4]: *** [drivers/net/wireless/iwlwifi/iwl-agn-tt.o] Error 1
make[3]: *** [drivers/net/wireless/iwlwifi] Error 2
make[2]: *** [drivers/net/wireless] Error 2
make[1]: *** [drivers/net] Error 2
make: *** [drivers] Error 2

Signed-off-by: Larry Finger <[email protected]>
---

Index: wireless-testing-new/drivers/net/wireless/iwlwifi/iwl-agn.h
===================================================================
--- wireless-testing-new.orig/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ wireless-testing-new/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -425,6 +425,7 @@ void iwl_testmode_cleanup(struct iwl_pri
#ifdef CONFIG_IWLWIFI_DEBUG
void iwl_print_rx_config_cmd(struct iwl_priv *priv,
enum iwl_rxon_context_id ctxid);
+int iwl_alloc_traffic_mem(struct iwl_priv *priv);
#else
static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv,
enum iwl_rxon_context_id ctxid)
@@ -510,7 +511,6 @@ void iwl_setup_deferred_work(struct iwl_
int iwl_send_wimax_coex(struct iwl_priv *priv);
int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
void iwl_debug_config(struct iwl_priv *priv);
-int iwl_alloc_traffic_mem(struct iwl_priv *priv);
void iwl_set_hw_params(struct iwl_priv *priv);
void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
int iwl_init_drv(struct iwl_priv *priv);


2012-04-18 03:05:57

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: Fix compile when CONFIG_IWLWIFI_DEBUG is not defined

On 04/17/2012 09:23 PM, Johannes Berg wrote:
> On Tue, 2012-04-17 at 18:19 -0500, Larry Finger wrote:
>> If CONFIG_IWLWIFI_DEBUG is not defined, the following error results when
>> compiling iwlwifi:
>>
>> CC [M] drivers/net/wireless/iwlwifi/iwl-agn-tt.o
>> In file included from drivers/net/wireless/iwlwifi/iwl-agn-tt.c:40:0:
>> drivers/net/wireless/iwlwifi/iwl-core.h:97:19: error: static declaration of ‘iwl_alloc_traffic_mem’ follows non-static declaration
>> drivers/net/wireless/iwlwifi/iwl-agn.h:513:5: note: previous declaration of ‘iwl_alloc_traffic_mem’ was here
>> make[4]: *** [drivers/net/wireless/iwlwifi/iwl-agn-tt.o] Error 1
>> make[3]: *** [drivers/net/wireless/iwlwifi] Error 2
>> make[2]: *** [drivers/net/wireless] Error 2
>> make[1]: *** [drivers/net] Error 2
>> make: *** [drivers] Error 2
>
> Totally fine with me. We have a pending patch to completely remove that
> functionality though :-)

Until your patch hits the tree, mine will allow everyone to build the driver.

Larry



2012-04-18 02:23:56

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] iwlwifi: Fix compile when CONFIG_IWLWIFI_DEBUG is not defined

On Tue, 2012-04-17 at 18:19 -0500, Larry Finger wrote:
> If CONFIG_IWLWIFI_DEBUG is not defined, the following error results when
> compiling iwlwifi:
>
> CC [M] drivers/net/wireless/iwlwifi/iwl-agn-tt.o
> In file included from drivers/net/wireless/iwlwifi/iwl-agn-tt.c:40:0:
> drivers/net/wireless/iwlwifi/iwl-core.h:97:19: error: static declaration of ‘iwl_alloc_traffic_mem’ follows non-static declaration
> drivers/net/wireless/iwlwifi/iwl-agn.h:513:5: note: previous declaration of ‘iwl_alloc_traffic_mem’ was here
> make[4]: *** [drivers/net/wireless/iwlwifi/iwl-agn-tt.o] Error 1
> make[3]: *** [drivers/net/wireless/iwlwifi] Error 2
> make[2]: *** [drivers/net/wireless] Error 2
> make[1]: *** [drivers/net] Error 2
> make: *** [drivers] Error 2

Totally fine with me. We have a pending patch to completely remove that
functionality though :-)

johannes