iwlwifi: move ucode notification from iwl_priv to iwl_shared

Move the notification structures for ucode operations from the
iwl_priv structure to the iwl_shared structure, with associated
code changes.

Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
index 087fd52e572..90c55ea4cc3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
@@ -1131,9 +1131,9 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv)
         priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;
 
         /* set up notification wait support */
-        spin_lock_init(&priv->notif_wait_lock);
-        INIT_LIST_HEAD(&priv->notif_waits);
-        init_waitqueue_head(&priv->notif_waitq);
+        spin_lock_init(&priv->shrd->notif_wait_lock);
+        INIT_LIST_HEAD(&priv->shrd->notif_waits);
+        init_waitqueue_head(&priv->shrd->notif_waitq);
 
         /* Set up BT Rx handlers */
         if (priv->cfg->lib->bt_rx_handler_setup)
@@ -1152,11 +1152,11 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
          * even if the RX handler consumes the RXB we have
          * access to it in the notification wait entry.
          */
-        if (!list_empty(&priv->notif_waits)) {
+        if (!list_empty(&priv->shrd->notif_waits)) {
                 struct iwl_notification_wait *w;
 
-                spin_lock(&priv->notif_wait_lock);
-                list_for_each_entry(w, &priv->notif_waits, list) {
+                spin_lock(&priv->shrd->notif_wait_lock);
+                list_for_each_entry(w, &priv->shrd->notif_waits, list) {
                         if (w->cmd != pkt->hdr.cmd)
                                 continue;
                         IWL_DEBUG_RX(priv,
@@ -1167,9 +1167,9 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
                         if (w->fn)
                                 w->fn(priv, pkt, w->fn_data);
                 }
-                spin_unlock(&priv->notif_wait_lock);
+                spin_unlock(&priv->shrd->notif_wait_lock);
 
-                wake_up_all(&priv->notif_waitq);
+                wake_up_all(&priv->shrd->notif_waitq);
         }
 
         if (priv->pre_rx_handler)