iwlagn: extend notification wait function

A notification wait function is called with the
command, but currently has no way of passing
data back to the caller -- fix that by adding a
void pointer to the function that can be used
between the caller and the function.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

5 files changed, 16 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 5e62a089e9ba..486a8d3a1f0d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2256,11 +2256,14 @@ int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display)
 /* notification wait support */
 void iwlagn_init_notification_wait(struct iwl_priv *priv,
                                    struct iwl_notification_wait *wait_entry,
+                                   u8 cmd,
                                    void (*fn)(struct iwl_priv *priv,
-                                              struct iwl_rx_packet *pkt),
-                                   u8 cmd)
+                                              struct iwl_rx_packet *pkt,
+                                              void *data),
+                                   void *fn_data)
 {
         wait_entry->fn = fn;
+        wait_entry->fn_data = fn_data;
         wait_entry->cmd = cmd;
         wait_entry->triggered = false;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 56f46ee3bacd..ee7c5ba95971 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -58,8 +58,9 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         u8 old_dev_type = send->dev_type;
         int ret;
 
-        iwlagn_init_notification_wait(priv, &disable_wait, NULL,
-                                      REPLY_WIPAN_DEACTIVATION_COMPLETE);
+        iwlagn_init_notification_wait(priv, &disable_wait,
+                                      REPLY_WIPAN_DEACTIVATION_COMPLETE,
+                                      NULL, NULL);
 
         send->filter_flags &= ~RXON_FILTER_ASSOC_MSK;
         send->dev_type = RXON_DEV_TYPE_P2P;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e99cd9474ba8..a9204db377a8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -769,7 +769,7 @@ static void iwl_rx_handle(struct iwl_priv *priv)
                                 if (w->cmd == pkt->hdr.cmd) {
                                         w->triggered = true;
                                         if (w->fn)
-                                                w->fn(priv, pkt);
+                                                w->fn(priv, pkt, w->fn_data);
                                 }
                         }
                         spin_unlock(&priv->_agn.notif_wait_lock);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index ef1bbd415b16..b9871c4b3c18 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -338,9 +338,11 @@ void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv);
 void __acquires(wait_entry)
 iwlagn_init_notification_wait(struct iwl_priv *priv,
                               struct iwl_notification_wait *wait_entry,
+                              u8 cmd,
                               void (*fn)(struct iwl_priv *priv,
-                                         struct iwl_rx_packet *pkt),
-                              u8 cmd);
+                                         struct iwl_rx_packet *pkt,
+                                         void *data),
+                              void *fn_data);
 signed long __releases(wait_entry)
 iwlagn_wait_notification(struct iwl_priv *priv,
                          struct iwl_notification_wait *wait_entry,
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index e84534c4d956..d8bf11727aac 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1105,7 +1105,9 @@ struct iwl_force_reset {
 struct iwl_notification_wait {
         struct list_head list;
 
-        void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt);
+        void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,
+                   void *data);
+        void *fn_data;
 
         u8 cmd;
         bool triggered;