iwlwifi: move ucode loading to op_mode

[mv-sheeva.git] / drivers / net / wireless / iwlwifi / iwl-shared.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index ef80e0386c30d9aa5c06fcaec973270d88f94534..dc5544653bc0b1a919eed539c7c01c0427564866 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -233,7 +233,7 @@ enum iwl_ucode_type {
 struct iwl_notification_wait {
        struct list_head list;
 
-       void (*fn)(struct iwl_trans *trans, struct iwl_rx_packet *pkt,
+       void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,
                   void *data);
        void *fn_data;
 
@@ -472,12 +472,12 @@ bool iwl_check_for_ct_kill(struct iwl_priv *priv);
 void iwl_abort_notification_waits(struct iwl_shared *shrd);
 void __acquires(wait_entry)
 iwl_init_notification_wait(struct iwl_shared *shrd,
-                             struct iwl_notification_wait *wait_entry,
-                             u8 cmd,
-                             void (*fn)(struct iwl_trans *trans,
-                                        struct iwl_rx_packet *pkt,
-                                        void *data),
-                             void *fn_data);
+                          struct iwl_notification_wait *wait_entry,
+                          u8 cmd,
+                          void (*fn)(struct iwl_priv *priv,
+                                     struct iwl_rx_packet *pkt,
+                                     void *data),
+                          void *fn_data);
 int __must_check __releases(wait_entry)
 iwl_wait_notification(struct iwl_shared *shrd,
                         struct iwl_notification_wait *wait_entry,