summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-03-25 11:14:52 -0700
committerReinette Chatre <reinette.chatre@intel.com>2010-03-25 11:14:52 -0700
commite184f67d39f681b1e8c9a43ff7001c3405c2bd7c (patch)
treef1b8f13d2a558344da3e3669247fc7259027bc9b /drivers/net/wireless
parent76232ebf898c4d5e657f2b663fbf7108bca80ded (diff)
downloadblackbird-op-linux-e184f67d39f681b1e8c9a43ff7001c3405c2bd7c.tar.gz
blackbird-op-linux-e184f67d39f681b1e8c9a43ff7001c3405c2bd7c.zip
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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-rx.c2
1 files changed, 0 insertions, 2 deletions
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.
OpenPOWER on IntegriCloud