iwlwifi: move PLCP defines to config

Since they're used in the config, they
should be declared in iwl-config.h.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/iwlwifi/iwl-config.h
index 47bfd5e59575fe116781e64c5b2478099e57ac79..71e6285346793726842a2e4eb802fb9e3aa5795c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/iwlwifi/iwl-config.h
@@ -101,6 +101,18 @@ enum iwl_led_mode {
        IWL_LED_DISABLE,
 };
 
+/*
+ * This is the threshold value of plcp error rate per 100mSecs.  It is
+ * used to set and check for the validity of plcp_delta.
+ */
+#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN         1
+#define IWL_MAX_PLCP_ERR_THRESHOLD_DEF         50
+#define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF    100
+#define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF        200
+#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX         255
+#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE     0
+
+
 /*
  * @max_ll_items: max number of OTP blocks
  * @shadow_ram_support: shadow support for OTP memory

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 6853fc72abb9fd37969208a7a92d8ed57bbc118b..80cd94226ebde3dc8d3b40ef2ca90e4368c6bd1c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -533,17 +533,6 @@ struct iwl_event_log {
        int wraps_more_count;
 };
 
-/*
- * This is the threshold value of plcp error rate per 100mSecs.  It is
- * used to set and check for the validity of plcp_delta.
- */
-#define IWL_MAX_PLCP_ERR_THRESHOLD_MIN (1)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_DEF (50)
-#define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF    (100)
-#define IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF        (200)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_MAX (255)
-#define IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE     (0)
-
 #define IWL_DELAY_NEXT_FORCE_RF_RESET  (HZ*3)
 
 /* TX queue watchdog timeouts in mSecs */