diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 21 | 
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h index 8292f6d48ec..75e50d33ecb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.h @@ -299,7 +299,6 @@ enum {  #define TIME_WRAP_AROUND(x, y) (((y) > (x)) ? (y) - (x) : (0-(x)) + (y))  extern const struct iwl_rate_info iwl_rates[IWL_RATE_COUNT]; -extern const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945];  enum iwl_table_type {  	LQ_NONE, @@ -432,6 +431,8 @@ struct iwl_lq_sta {  	u32 last_rate_n_flags;  	/* packets destined for this STA are aggregated */  	u8 is_agg; +	/* BT traffic this sta was last updated in */ +	u8 last_bt_traffic;  };  static inline u8 num_of_ant(u8 mask) @@ -451,24 +452,6 @@ static inline u8 first_antenna(u8 mask)  } -static inline u8 iwl_get_prev_ieee_rate(u8 rate_index) -{ -	u8 rate = iwl_rates[rate_index].prev_ieee; - -	if (rate == IWL_RATE_INVALID) -		rate = rate_index; -	return rate; -} - -static inline u8 iwl3945_get_prev_ieee_rate(u8 rate_index) -{ -	u8 rate = iwl3945_rates[rate_index].prev_ieee; - -	if (rate == IWL_RATE_INVALID) -		rate = rate_index; -	return rate; -} -  /**   * iwl3945_rate_scale_init - Initialize the rate scale table based on assoc info   *  |