aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-shared.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-shared.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-shared.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index 53cddd32fb74..29a7284aa3ef 100644
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -97,6 +97,7 @@
97struct iwl_cfg; 97struct iwl_cfg;
98struct iwl_bus; 98struct iwl_bus;
99struct iwl_priv; 99struct iwl_priv;
100struct iwl_trans;
100struct iwl_sensitivity_ranges; 101struct iwl_sensitivity_ranges;
101struct iwl_trans_ops; 102struct iwl_trans_ops;
102 103
@@ -294,7 +295,7 @@ enum iwl_ucode_type {
294struct iwl_notification_wait { 295struct iwl_notification_wait {
295 struct list_head list; 296 struct list_head list;
296 297
297 void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt, 298 void (*fn)(struct iwl_trans *trans, struct iwl_rx_packet *pkt,
298 void *data); 299 void *data);
299 void *fn_data; 300 void *fn_data;
300 301
@@ -323,6 +324,7 @@ struct iwl_notification_wait {
323 * @notif_waits: things waiting for notification 324 * @notif_waits: things waiting for notification
324 * @notif_wait_lock: lock protecting notification 325 * @notif_wait_lock: lock protecting notification
325 * @notif_waitq: head of notification wait queue 326 * @notif_waitq: head of notification wait queue
327 * @device_pointers: pointers to ucode event tables
326 */ 328 */
327struct iwl_shared { 329struct iwl_shared {
328#ifdef CONFIG_IWLWIFI_DEBUG 330#ifdef CONFIG_IWLWIFI_DEBUG
@@ -361,6 +363,12 @@ struct iwl_shared {
361 struct list_head notif_waits; 363 struct list_head notif_waits;
362 spinlock_t notif_wait_lock; 364 spinlock_t notif_wait_lock;
363 wait_queue_head_t notif_waitq; 365 wait_queue_head_t notif_waitq;
366
367 struct {
368 u32 error_event_table;
369 u32 log_event_table;
370 } device_pointers;
371
364}; 372};
365 373
366/*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */ 374/*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */
@@ -510,7 +518,7 @@ void __acquires(wait_entry)
510iwl_init_notification_wait(struct iwl_shared *shrd, 518iwl_init_notification_wait(struct iwl_shared *shrd,
511 struct iwl_notification_wait *wait_entry, 519 struct iwl_notification_wait *wait_entry,
512 u8 cmd, 520 u8 cmd,
513 void (*fn)(struct iwl_priv *priv, 521 void (*fn)(struct iwl_trans *trans,
514 struct iwl_rx_packet *pkt, 522 struct iwl_rx_packet *pkt,
515 void *data), 523 void *data),
516 void *fn_data); 524 void *fn_data);