diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.h | 87 |
1 files changed, 32 insertions, 55 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h index d1716844002e..d941c4c98e4b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.h +++ b/drivers/net/wireless/iwlwifi/iwl-agn.h | |||
@@ -109,42 +109,25 @@ extern struct iwl_cfg iwl135_bg_cfg; | |||
109 | extern struct iwl_cfg iwl135_bgn_cfg; | 109 | extern struct iwl_cfg iwl135_bgn_cfg; |
110 | 110 | ||
111 | extern struct iwl_mod_params iwlagn_mod_params; | 111 | extern struct iwl_mod_params iwlagn_mod_params; |
112 | extern struct iwl_hcmd_ops iwlagn_hcmd; | ||
113 | extern struct iwl_hcmd_ops iwlagn_bt_hcmd; | ||
114 | extern struct iwl_hcmd_utils_ops iwlagn_hcmd_utils; | ||
115 | 112 | ||
116 | extern struct ieee80211_ops iwlagn_hw_ops; | 113 | extern struct ieee80211_ops iwlagn_hw_ops; |
117 | 114 | ||
118 | int iwl_reset_ict(struct iwl_priv *priv); | 115 | int iwl_reset_ict(struct iwl_priv *priv); |
119 | void iwl_disable_ict(struct iwl_priv *priv); | ||
120 | int iwl_alloc_isr_ict(struct iwl_priv *priv); | ||
121 | void iwl_free_isr_ict(struct iwl_priv *priv); | ||
122 | irqreturn_t iwl_isr_ict(int irq, void *data); | ||
123 | 116 | ||
124 | /* call this function to flush any scheduled tasklet */ | 117 | static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd) |
125 | static inline void iwl_synchronize_irq(struct iwl_priv *priv) | ||
126 | { | 118 | { |
127 | /* wait to make sure we flush pending tasklet*/ | 119 | hdr->op_code = cmd; |
128 | synchronize_irq(priv->pci_dev->irq); | 120 | hdr->first_group = 0; |
129 | tasklet_kill(&priv->irq_tasklet); | 121 | hdr->groups_num = 1; |
122 | hdr->data_valid = 1; | ||
130 | } | 123 | } |
131 | 124 | ||
132 | int iwl_prepare_card_hw(struct iwl_priv *priv); | ||
133 | |||
134 | int iwlagn_start_device(struct iwl_priv *priv); | ||
135 | void iwlagn_stop_device(struct iwl_priv *priv); | ||
136 | |||
137 | /* tx queue */ | 125 | /* tx queue */ |
138 | void iwlagn_set_wr_ptrs(struct iwl_priv *priv, | ||
139 | int txq_id, u32 index); | ||
140 | void iwlagn_tx_queue_set_status(struct iwl_priv *priv, | ||
141 | struct iwl_tx_queue *txq, | ||
142 | int tx_fifo_id, int scd_retry); | ||
143 | void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask); | ||
144 | void iwl_free_tfds_in_queue(struct iwl_priv *priv, | 126 | void iwl_free_tfds_in_queue(struct iwl_priv *priv, |
145 | int sta_id, int tid, int freed); | 127 | int sta_id, int tid, int freed); |
146 | 128 | ||
147 | /* RXON */ | 129 | /* RXON */ |
130 | int iwlagn_set_pan_params(struct iwl_priv *priv); | ||
148 | int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx); | 131 | int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx); |
149 | void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx); | 132 | void iwlagn_set_rxon_chain(struct iwl_priv *priv, struct iwl_rxon_context *ctx); |
150 | int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed); | 133 | int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed); |
@@ -161,41 +144,29 @@ void iwlagn_send_prio_tbl(struct iwl_priv *priv); | |||
161 | int iwlagn_run_init_ucode(struct iwl_priv *priv); | 144 | int iwlagn_run_init_ucode(struct iwl_priv *priv); |
162 | int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv, | 145 | int iwlagn_load_ucode_wait_alive(struct iwl_priv *priv, |
163 | struct fw_img *image, | 146 | struct fw_img *image, |
164 | int subtype, int alternate_subtype); | 147 | enum iwlagn_ucode_type ucode_type); |
165 | 148 | ||
166 | /* lib */ | 149 | /* lib */ |
167 | void iwl_check_abort_status(struct iwl_priv *priv, | 150 | void iwl_check_abort_status(struct iwl_priv *priv, |
168 | u8 frame_count, u32 status); | 151 | u8 frame_count, u32 status); |
169 | void iwlagn_rx_handler_setup(struct iwl_priv *priv); | ||
170 | void iwlagn_setup_deferred_work(struct iwl_priv *priv); | ||
171 | int iwlagn_hw_valid_rtc_data_addr(u32 addr); | 152 | int iwlagn_hw_valid_rtc_data_addr(u32 addr); |
172 | int iwlagn_send_tx_power(struct iwl_priv *priv); | 153 | int iwlagn_send_tx_power(struct iwl_priv *priv); |
173 | void iwlagn_temperature(struct iwl_priv *priv); | 154 | void iwlagn_temperature(struct iwl_priv *priv); |
174 | u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv); | 155 | u16 iwlagn_eeprom_calib_version(struct iwl_priv *priv); |
175 | const u8 *iwlagn_eeprom_query_addr(const struct iwl_priv *priv, | ||
176 | size_t offset); | ||
177 | void iwlagn_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq); | ||
178 | int iwlagn_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq); | ||
179 | int iwlagn_hw_nic_init(struct iwl_priv *priv); | ||
180 | int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv); | 156 | int iwlagn_wait_tx_queue_empty(struct iwl_priv *priv); |
181 | int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control); | 157 | int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control); |
182 | void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control); | 158 | void iwlagn_dev_txfifo_flush(struct iwl_priv *priv, u16 flush_control); |
159 | int iwlagn_send_beacon_cmd(struct iwl_priv *priv); | ||
183 | 160 | ||
184 | /* rx */ | 161 | /* rx */ |
185 | void iwlagn_rx_queue_restock(struct iwl_priv *priv); | ||
186 | void iwlagn_rx_allocate(struct iwl_priv *priv, gfp_t priority); | ||
187 | void iwlagn_rx_replenish(struct iwl_priv *priv); | ||
188 | void iwlagn_rx_replenish_now(struct iwl_priv *priv); | ||
189 | void iwlagn_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq); | ||
190 | int iwlagn_rxq_stop(struct iwl_priv *priv); | ||
191 | int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band); | 162 | int iwlagn_hwrate_to_mac80211_idx(u32 rate_n_flags, enum ieee80211_band band); |
192 | void iwl_setup_rx_handlers(struct iwl_priv *priv); | 163 | void iwl_setup_rx_handlers(struct iwl_priv *priv); |
164 | void iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb); | ||
165 | |||
193 | 166 | ||
194 | /* tx */ | 167 | /* tx */ |
195 | void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq); | 168 | void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq, |
196 | int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv, | 169 | int index); |
197 | struct iwl_tx_queue *txq, | ||
198 | dma_addr_t addr, u16 len, u8 reset); | ||
199 | void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags, | 170 | void iwlagn_hwrate_to_tx_control(struct iwl_priv *priv, u32 rate_n_flags, |
200 | struct ieee80211_tx_info *info); | 171 | struct ieee80211_tx_info *info); |
201 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); | 172 | int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb); |
@@ -203,18 +174,12 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, | |||
203 | struct ieee80211_sta *sta, u16 tid, u16 *ssn); | 174 | struct ieee80211_sta *sta, u16 tid, u16 *ssn); |
204 | int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, | 175 | int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif, |
205 | struct ieee80211_sta *sta, u16 tid); | 176 | struct ieee80211_sta *sta, u16 tid); |
206 | void iwlagn_txq_agg_queue_setup(struct iwl_priv *priv, | ||
207 | struct ieee80211_sta *sta, | ||
208 | int tid, int frame_limit); | ||
209 | int iwlagn_txq_check_empty(struct iwl_priv *priv, | 177 | int iwlagn_txq_check_empty(struct iwl_priv *priv, |
210 | int sta_id, u8 tid, int txq_id); | 178 | int sta_id, u8 tid, int txq_id); |
211 | void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, | 179 | void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, |
212 | struct iwl_rx_mem_buffer *rxb); | 180 | struct iwl_rx_mem_buffer *rxb); |
181 | void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb); | ||
213 | int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index); | 182 | int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index); |
214 | void iwlagn_hw_txq_ctx_free(struct iwl_priv *priv); | ||
215 | int iwlagn_txq_ctx_alloc(struct iwl_priv *priv); | ||
216 | void iwlagn_txq_ctx_reset(struct iwl_priv *priv); | ||
217 | void iwlagn_txq_ctx_stop(struct iwl_priv *priv); | ||
218 | 183 | ||
219 | static inline u32 iwl_tx_status_to_mac80211(u32 status) | 184 | static inline u32 iwl_tx_status_to_mac80211(u32 status) |
220 | { | 185 | { |
@@ -249,10 +214,6 @@ void iwlagn_post_scan(struct iwl_priv *priv); | |||
249 | int iwlagn_manage_ibss_station(struct iwl_priv *priv, | 214 | int iwlagn_manage_ibss_station(struct iwl_priv *priv, |
250 | struct ieee80211_vif *vif, bool add); | 215 | struct ieee80211_vif *vif, bool add); |
251 | 216 | ||
252 | /* hcmd */ | ||
253 | int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant); | ||
254 | int iwlagn_send_beacon_cmd(struct iwl_priv *priv); | ||
255 | |||
256 | /* bt coex */ | 217 | /* bt coex */ |
257 | void iwlagn_send_advance_bt_config(struct iwl_priv *priv); | 218 | void iwlagn_send_advance_bt_config(struct iwl_priv *priv); |
258 | void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, | 219 | void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, |
@@ -260,6 +221,8 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, | |||
260 | void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv); | 221 | void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv); |
261 | void iwlagn_bt_setup_deferred_work(struct iwl_priv *priv); | 222 | void iwlagn_bt_setup_deferred_work(struct iwl_priv *priv); |
262 | void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv); | 223 | void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv); |
224 | void iwlagn_bt_coex_rssi_monitor(struct iwl_priv *priv); | ||
225 | void iwlagn_bt_adjust_rssi_monitor(struct iwl_priv *priv, bool rssi_ena); | ||
263 | 226 | ||
264 | #ifdef CONFIG_IWLWIFI_DEBUG | 227 | #ifdef CONFIG_IWLWIFI_DEBUG |
265 | const char *iwl_get_tx_fail_reason(u32 status); | 228 | const char *iwl_get_tx_fail_reason(u32 status); |
@@ -283,11 +246,13 @@ int iwl_set_default_wep_key(struct iwl_priv *priv, | |||
283 | int iwl_restore_default_wep_keys(struct iwl_priv *priv, | 246 | int iwl_restore_default_wep_keys(struct iwl_priv *priv, |
284 | struct iwl_rxon_context *ctx); | 247 | struct iwl_rxon_context *ctx); |
285 | int iwl_set_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | 248 | int iwl_set_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx, |
286 | struct ieee80211_key_conf *key, u8 sta_id); | 249 | struct ieee80211_key_conf *key, |
250 | struct ieee80211_sta *sta); | ||
287 | int iwl_remove_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | 251 | int iwl_remove_dynamic_key(struct iwl_priv *priv, struct iwl_rxon_context *ctx, |
288 | struct ieee80211_key_conf *key, u8 sta_id); | 252 | struct ieee80211_key_conf *key, |
253 | struct ieee80211_sta *sta); | ||
289 | void iwl_update_tkip_key(struct iwl_priv *priv, | 254 | void iwl_update_tkip_key(struct iwl_priv *priv, |
290 | struct iwl_rxon_context *ctx, | 255 | struct ieee80211_vif *vif, |
291 | struct ieee80211_key_conf *keyconf, | 256 | struct ieee80211_key_conf *keyconf, |
292 | struct ieee80211_sta *sta, u32 iv32, u16 *phase1key); | 257 | struct ieee80211_sta *sta, u32 iv32, u16 *phase1key); |
293 | int iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid); | 258 | int iwl_sta_tx_modify_enable_tid(struct iwl_priv *priv, int sta_id, int tid); |
@@ -296,6 +261,8 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, struct ieee80211_sta *sta, | |||
296 | int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta, | 261 | int iwl_sta_rx_agg_stop(struct iwl_priv *priv, struct ieee80211_sta *sta, |
297 | int tid); | 262 | int tid); |
298 | void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt); | 263 | void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt); |
264 | int iwl_update_bcast_station(struct iwl_priv *priv, | ||
265 | struct iwl_rxon_context *ctx); | ||
299 | int iwl_update_bcast_stations(struct iwl_priv *priv); | 266 | int iwl_update_bcast_stations(struct iwl_priv *priv); |
300 | void iwlagn_mac_sta_notify(struct ieee80211_hw *hw, | 267 | void iwlagn_mac_sta_notify(struct ieee80211_hw *hw, |
301 | struct ieee80211_vif *vif, | 268 | struct ieee80211_vif *vif, |
@@ -343,6 +310,9 @@ extern int iwl_alive_start(struct iwl_priv *priv); | |||
343 | /* svtool */ | 310 | /* svtool */ |
344 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL | 311 | #ifdef CONFIG_IWLWIFI_DEVICE_SVTOOL |
345 | extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len); | 312 | extern int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len); |
313 | extern int iwl_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | ||
314 | struct netlink_callback *cb, | ||
315 | void *data, int len); | ||
346 | extern void iwl_testmode_init(struct iwl_priv *priv); | 316 | extern void iwl_testmode_init(struct iwl_priv *priv); |
347 | extern void iwl_testmode_cleanup(struct iwl_priv *priv); | 317 | extern void iwl_testmode_cleanup(struct iwl_priv *priv); |
348 | #else | 318 | #else |
@@ -352,6 +322,13 @@ int iwl_testmode_cmd(struct ieee80211_hw *hw, void *data, int len) | |||
352 | return -ENOSYS; | 322 | return -ENOSYS; |
353 | } | 323 | } |
354 | static inline | 324 | static inline |
325 | int iwl_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb, | ||
326 | struct netlink_callback *cb, | ||
327 | void *data, int len) | ||
328 | { | ||
329 | return -ENOSYS; | ||
330 | } | ||
331 | static inline | ||
355 | void iwl_testmode_init(struct iwl_priv *priv) | 332 | void iwl_testmode_init(struct iwl_priv *priv) |
356 | { | 333 | { |
357 | } | 334 | } |