From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 24 Mar 2010 21:21:08 +0000 (-0400)
Subject: iwlwifi: fix build error for CONFIG_IWLAGN=n
X-Git-Tag: v2.6.35-rc1~473^2~671^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76232ebf898c4d5e657f2b663fbf7108bca80ded;p=pandora-kernel.git

iwlwifi: fix build error for CONFIG_IWLAGN=n

drivers/net/wireless/iwlwifi/iwl-rx.c: In function 'iwl_good_ack_health':
drivers/net/wireless/iwlwifi/iwl-rx.c:647: error: 'struct iwl_priv' has no member named '_agn'

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index b6a64d83718a..2fa30dfb7c59 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -621,6 +621,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv,
 #define BA_TIMEOUT_CNT (5)
 #define BA_TIMEOUT_MAX (16)
 
+#if defined(CONFIG_IWLAGN) || defined(CONFIG_IWLAGN_MODULE)
 /**
  * iwl_good_ack_health - checks for ACK count ratios, BA timeout retries.
  *
@@ -670,6 +671,7 @@ bool iwl_good_ack_health(struct iwl_priv *priv,
 	return rc;
 }
 EXPORT_SYMBOL(iwl_good_ack_health);
+#endif
 
 /**
  * iwl_good_plcp_health - checks for plcp error.