From: Reinette Chatre <reinette.chatre@intel.com>
Date: Thu, 25 Mar 2010 18:14:52 +0000 (-0700)
Subject: Revert "iwlwifi: fix build error for CONFIG_IWLAGN=n"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e184f67d39f681b1e8c9a43ff7001c3405c2bd7c;p=linux-beck.git

Revert "iwlwifi: fix build error for CONFIG_IWLAGN=n"

This reverts commit 76232ebf898c4d5e657f2b663fbf7108bca80ded.

iwl_good_ack_health only applies to aggregation and thus only to iwlagn. We
can thus move the function to iwlagn instead of modifying compile flags.
This is done in following patch.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index 2fa30dfb7c59..b6a64d83718a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -621,7 +621,6 @@ 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.
  *
@@ -671,7 +670,6 @@ 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.