diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:30:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:55:44 -0500 |
commit | ab5c0f1f2d525ed17f1abf727d213cf220ed26a8 (patch) | |
tree | 8e07f690aaed41e565f19baa9e0bc9e07ae561d8 /drivers/net | |
parent | 3cc241ad713dcc4e193aec40307e9070bf817908 (diff) |
iwlwifi: keep plcp_delta_threshold in priv
The base_params shouldn't be writable, so keep
a copy of this in priv that can be modified.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c index d16e73d1b5c..5c9c88b8609 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c | |||
@@ -320,7 +320,7 @@ static bool iwlagn_good_plcp_health(struct iwl_priv *priv, | |||
320 | unsigned int msecs) | 320 | unsigned int msecs) |
321 | { | 321 | { |
322 | int delta; | 322 | int delta; |
323 | int threshold = cfg(priv)->base_params->plcp_delta_threshold; | 323 | int threshold = priv->plcp_delta_threshold; |
324 | 324 | ||
325 | if (threshold == IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) { | 325 | if (threshold == IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) { |
326 | IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n"); | 326 | IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8cf149cd20c..ac23aa3dd6d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1045,6 +1045,9 @@ static int iwl_init_drv(struct iwl_priv *priv) | |||
1045 | priv->ieee_rates = NULL; | 1045 | priv->ieee_rates = NULL; |
1046 | priv->band = IEEE80211_BAND_2GHZ; | 1046 | priv->band = IEEE80211_BAND_2GHZ; |
1047 | 1047 | ||
1048 | priv->plcp_delta_threshold = | ||
1049 | cfg(priv)->base_params->plcp_delta_threshold; | ||
1050 | |||
1048 | priv->iw_mode = NL80211_IFTYPE_STATION; | 1051 | priv->iw_mode = NL80211_IFTYPE_STATION; |
1049 | priv->current_ht_config.smps = IEEE80211_SMPS_STATIC; | 1052 | priv->current_ht_config.smps = IEEE80211_SMPS_STATIC; |
1050 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; | 1053 | priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index b9b6d628f59..ade4134fc1e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -2241,7 +2241,7 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file, | |||
2241 | const size_t bufsz = sizeof(buf); | 2241 | const size_t bufsz = sizeof(buf); |
2242 | 2242 | ||
2243 | pos += scnprintf(buf + pos, bufsz - pos, "%u\n", | 2243 | pos += scnprintf(buf + pos, bufsz - pos, "%u\n", |
2244 | cfg(priv)->base_params->plcp_delta_threshold); | 2244 | priv->plcp_delta_threshold); |
2245 | 2245 | ||
2246 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 2246 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
2247 | } | 2247 | } |
@@ -2263,10 +2263,10 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, | |||
2263 | return -EINVAL; | 2263 | return -EINVAL; |
2264 | if ((plcp < IWL_MAX_PLCP_ERR_THRESHOLD_MIN) || | 2264 | if ((plcp < IWL_MAX_PLCP_ERR_THRESHOLD_MIN) || |
2265 | (plcp > IWL_MAX_PLCP_ERR_THRESHOLD_MAX)) | 2265 | (plcp > IWL_MAX_PLCP_ERR_THRESHOLD_MAX)) |
2266 | cfg(priv)->base_params->plcp_delta_threshold = | 2266 | priv->plcp_delta_threshold = |
2267 | IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE; | 2267 | IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE; |
2268 | else | 2268 | else |
2269 | cfg(priv)->base_params->plcp_delta_threshold = plcp; | 2269 | priv->plcp_delta_threshold = plcp; |
2270 | return count; | 2270 | return count; |
2271 | } | 2271 | } |
2272 | 2272 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 73acbab6c24..0c397fd635a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -770,6 +770,8 @@ struct iwl_priv { | |||
770 | struct iwl_channel_info *channel_info; /* channel info array */ | 770 | struct iwl_channel_info *channel_info; /* channel info array */ |
771 | u8 channel_count; /* # of channels */ | 771 | u8 channel_count; /* # of channels */ |
772 | 772 | ||
773 | u8 plcp_delta_threshold; | ||
774 | |||
773 | /* thermal calibration */ | 775 | /* thermal calibration */ |
774 | s32 temperature; /* Celsius */ | 776 | s32 temperature; /* Celsius */ |
775 | s32 last_temperature; | 777 | s32 last_temperature; |