diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-2000.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 3 |
6 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 809117d74196..e7844565ef55 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c | |||
| @@ -242,7 +242,6 @@ static struct iwl_base_params iwl1000_base_params = { | |||
| 242 | .chain_noise_scale = 1000, | 242 | .chain_noise_scale = 1000, |
| 243 | .wd_timeout = IWL_DEF_WD_TIMEOUT, | 243 | .wd_timeout = IWL_DEF_WD_TIMEOUT, |
| 244 | .max_event_log_size = 128, | 244 | .max_event_log_size = 128, |
| 245 | .ucode_tracing = true, | ||
| 246 | }; | 245 | }; |
| 247 | static struct iwl_ht_params iwl1000_ht_params = { | 246 | static struct iwl_ht_params iwl1000_ht_params = { |
| 248 | .ht_greenfield_support = true, | 247 | .ht_greenfield_support = true, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c index 0a330d16ce7e..dcd660818d21 100644 --- a/drivers/net/wireless/iwlwifi/iwl-2000.c +++ b/drivers/net/wireless/iwlwifi/iwl-2000.c | |||
| @@ -348,7 +348,6 @@ static struct iwl_base_params iwl2000_base_params = { | |||
| 348 | .chain_noise_scale = 1000, | 348 | .chain_noise_scale = 1000, |
| 349 | .wd_timeout = IWL_DEF_WD_TIMEOUT, | 349 | .wd_timeout = IWL_DEF_WD_TIMEOUT, |
| 350 | .max_event_log_size = 512, | 350 | .max_event_log_size = 512, |
| 351 | .ucode_tracing = true, | ||
| 352 | .shadow_reg_enable = true, | 351 | .shadow_reg_enable = true, |
| 353 | }; | 352 | }; |
| 354 | 353 | ||
| @@ -368,7 +367,6 @@ static struct iwl_base_params iwl2030_base_params = { | |||
| 368 | .chain_noise_scale = 1000, | 367 | .chain_noise_scale = 1000, |
| 369 | .wd_timeout = IWL_LONG_WD_TIMEOUT, | 368 | .wd_timeout = IWL_LONG_WD_TIMEOUT, |
| 370 | .max_event_log_size = 512, | 369 | .max_event_log_size = 512, |
| 371 | .ucode_tracing = true, | ||
| 372 | .shadow_reg_enable = true, | 370 | .shadow_reg_enable = true, |
| 373 | }; | 371 | }; |
| 374 | 372 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 79dd45c3aefc..14b75f1de186 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
| @@ -467,7 +467,6 @@ static struct iwl_base_params iwl5000_base_params = { | |||
| 467 | .chain_noise_scale = 1000, | 467 | .chain_noise_scale = 1000, |
| 468 | .wd_timeout = IWL_LONG_WD_TIMEOUT, | 468 | .wd_timeout = IWL_LONG_WD_TIMEOUT, |
| 469 | .max_event_log_size = 512, | 469 | .max_event_log_size = 512, |
| 470 | .ucode_tracing = true, | ||
| 471 | }; | 470 | }; |
| 472 | static struct iwl_ht_params iwl5000_ht_params = { | 471 | static struct iwl_ht_params iwl5000_ht_params = { |
| 473 | .ht_greenfield_support = true, | 472 | .ht_greenfield_support = true, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index a35338e20b10..81881aad8751 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -437,7 +437,6 @@ static struct iwl_base_params iwl6000_base_params = { | |||
| 437 | .chain_noise_scale = 1000, | 437 | .chain_noise_scale = 1000, |
| 438 | .wd_timeout = IWL_DEF_WD_TIMEOUT, | 438 | .wd_timeout = IWL_DEF_WD_TIMEOUT, |
| 439 | .max_event_log_size = 512, | 439 | .max_event_log_size = 512, |
| 440 | .ucode_tracing = true, | ||
| 441 | .shadow_reg_enable = true, | 440 | .shadow_reg_enable = true, |
| 442 | }; | 441 | }; |
| 443 | 442 | ||
| @@ -456,7 +455,6 @@ static struct iwl_base_params iwl6050_base_params = { | |||
| 456 | .chain_noise_scale = 1500, | 455 | .chain_noise_scale = 1500, |
| 457 | .wd_timeout = IWL_DEF_WD_TIMEOUT, | 456 | .wd_timeout = IWL_DEF_WD_TIMEOUT, |
| 458 | .max_event_log_size = 1024, | 457 | .max_event_log_size = 1024, |
| 459 | .ucode_tracing = true, | ||
| 460 | .shadow_reg_enable = true, | 458 | .shadow_reg_enable = true, |
| 461 | }; | 459 | }; |
| 462 | static struct iwl_base_params iwl6000_g2_base_params = { | 460 | static struct iwl_base_params iwl6000_g2_base_params = { |
| @@ -474,7 +472,6 @@ static struct iwl_base_params iwl6000_g2_base_params = { | |||
| 474 | .chain_noise_scale = 1000, | 472 | .chain_noise_scale = 1000, |
| 475 | .wd_timeout = IWL_LONG_WD_TIMEOUT, | 473 | .wd_timeout = IWL_LONG_WD_TIMEOUT, |
| 476 | .max_event_log_size = 512, | 474 | .max_event_log_size = 512, |
| 477 | .ucode_tracing = true, | ||
| 478 | .shadow_reg_enable = true, | 475 | .shadow_reg_enable = true, |
| 479 | }; | 476 | }; |
| 480 | 477 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 240abdf4347c..2e8c936e556d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
| @@ -249,7 +249,6 @@ struct iwl_mod_params { | |||
| 249 | * @wd_timeout: TX queues watchdog timeout | 249 | * @wd_timeout: TX queues watchdog timeout |
| 250 | * @temperature_kelvin: temperature report by uCode in kelvin | 250 | * @temperature_kelvin: temperature report by uCode in kelvin |
| 251 | * @max_event_log_size: size of event log buffer size for ucode event logging | 251 | * @max_event_log_size: size of event log buffer size for ucode event logging |
| 252 | * @ucode_tracing: support ucode continuous tracing | ||
| 253 | * @shadow_reg_enable: HW shadhow register bit | 252 | * @shadow_reg_enable: HW shadhow register bit |
| 254 | */ | 253 | */ |
| 255 | struct iwl_base_params { | 254 | struct iwl_base_params { |
| @@ -271,7 +270,6 @@ struct iwl_base_params { | |||
| 271 | unsigned int wd_timeout; | 270 | unsigned int wd_timeout; |
| 272 | bool temperature_kelvin; | 271 | bool temperature_kelvin; |
| 273 | u32 max_event_log_size; | 272 | u32 max_event_log_size; |
| 274 | const bool ucode_tracing; | ||
| 275 | const bool shadow_reg_enable; | 273 | const bool shadow_reg_enable; |
| 276 | }; | 274 | }; |
| 277 | /* | 275 | /* |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 897efacb96eb..c272204fccff 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
| @@ -1749,8 +1749,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) | |||
| 1749 | 1749 | ||
| 1750 | DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR); | 1750 | DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR); |
| 1751 | DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR); | 1751 | DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR); |
| 1752 | if (priv->cfg->base_params->ucode_tracing) | 1752 | DEBUGFS_ADD_FILE(ucode_tracing, dir_debug, S_IWUSR | S_IRUSR); |
| 1753 | DEBUGFS_ADD_FILE(ucode_tracing, dir_debug, S_IWUSR | S_IRUSR); | ||
| 1754 | DEBUGFS_ADD_FILE(ucode_bt_stats, dir_debug, S_IRUSR); | 1753 | DEBUGFS_ADD_FILE(ucode_bt_stats, dir_debug, S_IRUSR); |
| 1755 | DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR); | 1754 | DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR); |
| 1756 | DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR); | 1755 | DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR); |
