Subject: Re: net-next iwlwifi breaks compile - was Re: pull request: wireless-next 2012-04-18

From: "Guy, Wey-Yi" <[email-masked]>
Date: Thu, 19 Apr 2012 13:10:41 -0700

Hi David,

On Thu, 2012-04-19 at 15:49 -0400, David Miller wrote:
> From: "Venkataraman, Meenakshi" <[email-masked]>
> Date: Thu, 19 Apr 2012 19:47:58 +0000
> 
> > It was fixed internally in a subsequent patch, but that patch has
> > not made it into net-next. I don't see it in the public iwlwifi
> > repository either. We'll add the fix to the repository so you can
> > pick it up.
> 
> That's not how this works.
> 
> You should submit a patch to fix the build directly to me, immediately,
> so that I can push it directly into net-next as fast as possible.

The patch "iwlwifi-Remove-inconsistent-and-redundant-declaratio.patch"
already being push to John to address this issue

Thanks
Wey 
>>From c27cf685d185cc4604776252fdcaca5ad24abcca Mon Sep 17 00:00:00 2001
From: David Spinadel <[email-masked]>
Date: Tue, 27 Mar 2012 10:22:29 +0200
Subject: [PATCH 12/15] iwlwifi: Remove inconsistent and redundant declaration

Remove declaration of iwl_alloc_traffic_mem from iwl-agn.h,
from methods that was exposed to support MVM.

MVM doesn't have to use this declaration.

Signed-off-by: David Spinadel <[email-masked]>
Signed-off-by: Wey-Yi Guy <[email-masked]>
---
 drivers/net/wireless/iwlwifi/iwl-agn.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 67cd123..3d6f3e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -510,7 +510,6 @@ void iwl_setup_deferred_work(struct iwl_priv *priv);
 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);
-- 
1.7.0.4