Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

[linux-2.6] / drivers / net / wireless / iwlwifi / iwl-3945.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index a793cd11f73806163143e468825c0812ff84fd79..76c4ed1135f272dd587e2ce44aa597689ad1e65f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -265,7 +265,7 @@ void iwl3945_add_radiotap(struct iwl3945_priv *priv, struct sk_buff *skb,
        if (skb_headroom(skb) < sizeof(*iwl3945_rt)) {
                if (net_ratelimit())
                        printk(KERN_ERR "not enough headroom [%d] for "
-                              "radiotap head [%d]\n",
+                              "radiotap head [%zd]\n",
                               skb_headroom(skb), sizeof(*iwl3945_rt));
                return;
        }
@@ -520,10 +520,8 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
                        break;
 
                        /*
-                        * TODO: There is no callback function from upper
-                        * stack to inform us when associated status. this
-                        * work around to sniff assoc_resp management frame
-                        * and finish the association process.
+                        * TODO: Use the new callback function from
+                        * mac80211 instead of sniffing these packets.
                         */
                case IEEE80211_STYPE_ASSOC_RESP:
                case IEEE80211_STYPE_REASSOC_RESP:{
@@ -1006,14 +1004,6 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
                            CSR_HW_IF_CONFIG_REG_BIT_ALMAGOR_MM);
        }
 
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       /* Initialize the EEPROM */
-       rc = iwl3945_eeprom_init(priv);
-       if (rc)
-               return rc;
-
-       spin_lock_irqsave(&priv->lock, flags);
        if (EEPROM_SKU_CAP_OP_MODE_MRC == priv->eeprom.sku_cap) {
                IWL_DEBUG_INFO("SKU OP mode is mrc\n");
                iwl3945_set_bit(priv, CSR_HW_IF_CONFIG_REG,