diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 55dc5a866542..9f1d302e3a34 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1035,6 +1035,11 @@ struct iwl_event_log { | |||
1035 | #define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF (100) | 1035 | #define IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF (100) |
1036 | #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX (255) | 1036 | #define IWL_MAX_PLCP_ERR_THRESHOLD_MAX (255) |
1037 | 1037 | ||
1038 | enum iwl_reset { | ||
1039 | IWL_RF_RESET = 0, | ||
1040 | IWL_FW_RESET, | ||
1041 | }; | ||
1042 | |||
1038 | struct iwl_priv { | 1043 | struct iwl_priv { |
1039 | 1044 | ||
1040 | /* ieee device used by generic ieee processing code */ | 1045 | /* ieee device used by generic ieee processing code */ |
@@ -1066,6 +1071,9 @@ struct iwl_priv { | |||
1066 | /* storing the jiffies when the plcp error rate is received */ | 1071 | /* storing the jiffies when the plcp error rate is received */ |
1067 | unsigned long plcp_jiffies; | 1072 | unsigned long plcp_jiffies; |
1068 | 1073 | ||
1074 | /* force reset */ | ||
1075 | unsigned long last_force_reset_jiffies; | ||
1076 | |||
1069 | /* we allocate array of iwl4965_channel_info for NIC's valid channels. | 1077 | /* we allocate array of iwl4965_channel_info for NIC's valid channels. |
1070 | * Access via channel # using indirect index array */ | 1078 | * Access via channel # using indirect index array */ |
1071 | struct iwl_channel_info *channel_info; /* channel info array */ | 1079 | struct iwl_channel_info *channel_info; /* channel info array */ |
@@ -1087,7 +1095,6 @@ struct iwl_priv { | |||
1087 | unsigned long scan_start; | 1095 | unsigned long scan_start; |
1088 | unsigned long scan_pass_start; | 1096 | unsigned long scan_pass_start; |
1089 | unsigned long scan_start_tsf; | 1097 | unsigned long scan_start_tsf; |
1090 | unsigned long last_internal_scan_jiffies; | ||
1091 | void *scan; | 1098 | void *scan; |
1092 | int scan_bands; | 1099 | int scan_bands; |
1093 | struct cfg80211_scan_request *scan_request; | 1100 | struct cfg80211_scan_request *scan_request; |