summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-01-04 16:22:03 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-01-21 15:32:21 -0500
commitea67485ae6894e603984c3b13b8df54ae2c128d8 (patch)
tree525e83ff59493b7f0540b4ca708dc42c0f6f96f8
parent2a1a78d240c68b918406cb5b31a375eaf1dc1835 (diff)
downloadblackbird-op-linux-ea67485ae6894e603984c3b13b8df54ae2c128d8.tar.gz
blackbird-op-linux-ea67485ae6894e603984c3b13b8df54ae2c128d8.zip
iwlwifi: fix 4965 notification wait setup
The notification wait support code is shared between 4965 and other AGN devices, so 4965 also has to initialize the data structures for it, otherwise it crashes. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 3f1e5f1bf847..d9a7d93def6c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2316,6 +2316,11 @@ static void iwl4965_rx_handler_setup(struct iwl_priv *priv)
priv->rx_handlers[REPLY_RX] = iwlagn_rx_reply_rx;
/* Tx response */
priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx;
+
+ /* set up notification wait support */
+ spin_lock_init(&priv->_agn.notif_wait_lock);
+ INIT_LIST_HEAD(&priv->_agn.notif_waits);
+ init_waitqueue_head(&priv->_agn.notif_waitq);
}
static void iwl4965_setup_deferred_work(struct iwl_priv *priv)
OpenPOWER on IntegriCloud