aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-rx.c16
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 087fd52e5727..90c55ea4cc39 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)
1131 priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx; 1131 priv->rx_handlers[REPLY_TX] = iwlagn_rx_reply_tx;
1132 1132
1133 /* set up notification wait support */ 1133 /* set up notification wait support */
1134 spin_lock_init(&priv->notif_wait_lock); 1134 spin_lock_init(&priv->shrd->notif_wait_lock);
1135 INIT_LIST_HEAD(&priv->notif_waits); 1135 INIT_LIST_HEAD(&priv->shrd->notif_waits);
1136 init_waitqueue_head(&priv->notif_waitq); 1136 init_waitqueue_head(&priv->shrd->notif_waitq);
1137 1137
1138 /* Set up BT Rx handlers */ 1138 /* Set up BT Rx handlers */
1139 if (priv->cfg->lib->bt_rx_handler_setup) 1139 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,
1152 * even if the RX handler consumes the RXB we have 1152 * even if the RX handler consumes the RXB we have
1153 * access to it in the notification wait entry. 1153 * access to it in the notification wait entry.
1154 */ 1154 */
1155 if (!list_empty(&priv->notif_waits)) { 1155 if (!list_empty(&priv->shrd->notif_waits)) {
1156 struct iwl_notification_wait *w; 1156 struct iwl_notification_wait *w;
1157 1157
1158 spin_lock(&priv->notif_wait_lock); 1158 spin_lock(&priv->shrd->notif_wait_lock);
1159 list_for_each_entry(w, &priv->notif_waits, list) { 1159 list_for_each_entry(w, &priv->shrd->notif_waits, list) {
1160 if (w->cmd != pkt->hdr.cmd) 1160 if (w->cmd != pkt->hdr.cmd)
1161 continue; 1161 continue;
1162 IWL_DEBUG_RX(priv, 1162 IWL_DEBUG_RX(priv,
@@ -1167,9 +1167,9 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,
1167 if (w->fn) 1167 if (w->fn)
1168 w->fn(priv, pkt, w->fn_data); 1168 w->fn(priv, pkt, w->fn_data);
1169 } 1169 }
1170 spin_unlock(&priv->notif_wait_lock); 1170 spin_unlock(&priv->shrd->notif_wait_lock);
1171 1171
1172 wake_up_all(&priv->notif_waitq); 1172 wake_up_all(&priv->shrd->notif_waitq);
1173 } 1173 }
1174 1174
1175 if (priv->pre_rx_handler) 1175 if (priv->pre_rx_handler)