]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/net/wireless/iwlwifi/iwl4965-base.c
iwlwifi: trigger event log from debugfs
[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl4965-base.c
index 45b6b5234eefdff8d86eb5f9e4367824e462f43e..48c59cbefb4a0c831aad6dcd2577c6d91e0b2a75 100644 (file)
@@ -53,8 +53,6 @@
 #include "iwl-sta.h"
 #include "iwl-calib.h"
 
-static int iwl4965_tx_queue_update_write_ptr(struct iwl_priv *priv,
-                                 struct iwl_tx_queue *txq);
 
 /******************************************************************************
  *
@@ -89,16 +87,6 @@ MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR(DRV_COPYRIGHT);
 MODULE_LICENSE("GPL");
 
-__le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr)
-{
-       u16 fc = le16_to_cpu(hdr->frame_control);
-       int hdr_len = ieee80211_get_hdrlen(fc);
-
-       if ((fc & 0x00cc) == (IEEE80211_STYPE_QOS_DATA | IEEE80211_FTYPE_DATA))
-               return (__le16 *) ((u8 *) hdr + hdr_len - QOS_CONTROL_LEN);
-       return NULL;
-}
-
 static const struct ieee80211_supported_band *iwl_get_hw_mode(
                struct iwl_priv *priv, enum ieee80211_band band)
 {
@@ -145,70 +133,6 @@ static const char *iwl4965_escape_essid(const char *essid, u8 essid_len)
        return escaped;
 }
 
-
-/*************** DMA-QUEUE-GENERAL-FUNCTIONS  *****
- * DMA services
- *
- * Theory of operation
- *
- * A Tx or Rx queue resides in host DRAM, and is comprised of a circular buffer
- * of buffer descriptors, each of which points to one or more data buffers for
- * the device to read from or fill.  Driver and device exchange status of each
- * queue via "read" and "write" pointers.  Driver keeps minimum of 2 empty
- * entries in each circular buffer, to protect against confusing empty and full
- * queue states.
- *
- * The device reads or writes the data in the queues via the device's several
- * DMA/FIFO channels.  Each queue is mapped to a single DMA channel.
- *
- * For Tx queue, there are low mark and high mark limits. If, after queuing
- * the packet for Tx, free space become < low mark, Tx queue stopped. When
- * reclaiming packets (on 'tx done IRQ), if free space become > high mark,
- * Tx queue resumed.
- *
- * The 4965 operates with up to 17 queues:  One receive queue, one transmit
- * queue (#4) for sending commands to the device firmware, and 15 other
- * Tx queues that may be mapped to prioritized Tx DMA/FIFO channels.
- *
- * See more detailed info in iwl-4965-hw.h.
- ***************************************************/
-
-int iwl_queue_space(const struct iwl_queue *q)
-{
-       int s = q->read_ptr - q->write_ptr;
-
-       if (q->read_ptr > q->write_ptr)
-               s -= q->n_bd;
-
-       if (s <= 0)
-               s += q->n_window;
-       /* keep some reserve to not confuse empty and full situations */
-       s -= 2;
-       if (s < 0)
-               s = 0;
-       return s;
-}
-
-
-static inline int iwl_queue_used(const struct iwl_queue *q, int i)
-{
-       return q->write_ptr > q->read_ptr ?
-               (i >= q->read_ptr && i < q->write_ptr) :
-               !(i < q->read_ptr && i >= q->write_ptr);
-}
-
-static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)
-{
-       /* This is for scan command, the big buffer at end of command array */
-       if (is_huge)
-               return q->n_window;     /* must be power of 2 */
-
-       /* Otherwise, use normal size buffers */
-       return index & (q->n_window - 1);
-}
-
-const u8 iwl4965_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-
 /*************** STATION TABLE MANAGEMENT ****
  * mac80211 should be examined to determine if sta_info is duplicating
  * the functionality provided here
@@ -259,169 +183,7 @@ out:
 }
 #endif
 
-/**
- * iwl4965_add_station_flags - Add station to tables in driver and device
- */
-u8 iwl4965_add_station_flags(struct iwl_priv *priv, const u8 *addr,
-                               int is_ap, u8 flags, void *ht_data)
-{
-       int i;
-       int index = IWL_INVALID_STATION;
-       struct iwl_station_entry *station;
-       unsigned long flags_spin;
-       DECLARE_MAC_BUF(mac);
-
-       spin_lock_irqsave(&priv->sta_lock, flags_spin);
-       if (is_ap)
-               index = IWL_AP_ID;
-       else if (is_broadcast_ether_addr(addr))
-               index = priv->hw_params.bcast_sta_id;
-       else
-               for (i = IWL_STA_ID; i < priv->hw_params.max_stations; i++) {
-                       if (!compare_ether_addr(priv->stations[i].sta.sta.addr,
-                                               addr)) {
-                               index = i;
-                               break;
-                       }
-
-                       if (!priv->stations[i].used &&
-                           index == IWL_INVALID_STATION)
-                               index = i;
-               }
-
-
-       /* These two conditions have the same outcome, but keep them separate
-         since they have different meanings */
-       if (unlikely(index == IWL_INVALID_STATION)) {
-               spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-               return index;
-       }
-
-       if (priv->stations[index].used &&
-           !compare_ether_addr(priv->stations[index].sta.sta.addr, addr)) {
-               spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-               return index;
-       }
-
-
-       IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
-       station = &priv->stations[index];
-       station->used = 1;
-       priv->num_stations++;
-
-       /* Set up the REPLY_ADD_STA command to send to device */
-       memset(&station->sta, 0, sizeof(struct iwl_addsta_cmd));
-       memcpy(station->sta.sta.addr, addr, ETH_ALEN);
-       station->sta.mode = 0;
-       station->sta.sta.sta_id = index;
-       station->sta.station_flags = 0;
-
-#ifdef CONFIG_IWL4965_HT
-       /* BCAST station and IBSS stations do not work in HT mode */
-       if (index != priv->hw_params.bcast_sta_id &&
-           priv->iw_mode != IEEE80211_IF_TYPE_IBSS)
-               iwl4965_set_ht_add_station(priv, index,
-                                (struct ieee80211_ht_info *) ht_data);
-#endif /*CONFIG_IWL4965_HT*/
-
-       spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
-
-       /* Add station to device's station table */
-       iwl_send_add_sta(priv, &station->sta, flags);
-       return index;
-
-}
-
-
-
-/*************** HOST COMMAND QUEUE FUNCTIONS   *****/
-
-/**
- * iwl4965_enqueue_hcmd - enqueue a uCode command
- * @priv: device private data point
- * @cmd: a point to the ucode command structure
- *
- * The function returns < 0 values to indicate the operation is
- * failed. On success, it turns the index (> 0) of command in the
- * command queue.
- */
-int iwl4965_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
-{
-       struct iwl_tx_queue *txq = &priv->txq[IWL_CMD_QUEUE_NUM];
-       struct iwl_queue *q = &txq->q;
-       struct iwl_tfd_frame *tfd;
-       u32 *control_flags;
-       struct iwl_cmd *out_cmd;
-       u32 idx;
-       u16 fix_size;
-       dma_addr_t phys_addr;
-       int ret;
-       unsigned long flags;
-
-       cmd->len = priv->cfg->ops->utils->get_hcmd_size(cmd->id, cmd->len);
-       fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr));
-
-       /* If any of the command structures end up being larger than
-        * the TFD_MAX_PAYLOAD_SIZE, and it sent as a 'small' command then
-        * we will need to increase the size of the TFD entries */
-       BUG_ON((fix_size > TFD_MAX_PAYLOAD_SIZE) &&
-              !(cmd->meta.flags & CMD_SIZE_HUGE));
-
-       if (iwl_is_rfkill(priv)) {
-               IWL_DEBUG_INFO("Not sending command - RF KILL");
-               return -EIO;
-       }
-
-       if (iwl_queue_space(q) < ((cmd->meta.flags & CMD_ASYNC) ? 2 : 1)) {
-               IWL_ERROR("No space for Tx\n");
-               return -ENOSPC;
-       }
-
-       spin_lock_irqsave(&priv->hcmd_lock, flags);
-
-       tfd = &txq->bd[q->write_ptr];
-       memset(tfd, 0, sizeof(*tfd));
-
-       control_flags = (u32 *) tfd;
-
-       idx = get_cmd_index(q, q->write_ptr, cmd->meta.flags & CMD_SIZE_HUGE);
-       out_cmd = &txq->cmd[idx];
-
-       out_cmd->hdr.cmd = cmd->id;
-       memcpy(&out_cmd->meta, &cmd->meta, sizeof(cmd->meta));
-       memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len);
-
-       /* At this point, the out_cmd now has all of the incoming cmd
-        * information */
-
-       out_cmd->hdr.flags = 0;
-       out_cmd->hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(IWL_CMD_QUEUE_NUM) |
-                       INDEX_TO_SEQ(q->write_ptr));
-       if (out_cmd->meta.flags & CMD_SIZE_HUGE)
-               out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME);
 
-       phys_addr = txq->dma_addr_cmd + sizeof(txq->cmd[0]) * idx +
-                       offsetof(struct iwl_cmd, hdr);
-       iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, fix_size);
-
-       IWL_DEBUG_HC("Sending command %s (#%x), seq: 0x%04X, "
-                    "%d bytes at %d[%d]:%d\n",
-                    get_cmd_string(out_cmd->hdr.cmd),
-                    out_cmd->hdr.cmd, le16_to_cpu(out_cmd->hdr.sequence),
-                    fix_size, q->write_ptr, idx, IWL_CMD_QUEUE_NUM);
-
-       txq->need_update = 1;
-
-       /* Set up entry in queue's byte count circular buffer */
-       priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, 0);
-
-       /* Increment and update queue's write index */
-       q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
-       ret = iwl4965_tx_queue_update_write_ptr(priv, txq);
-
-       spin_unlock_irqrestore(&priv->hcmd_lock, flags);
-       return ret ? ret : idx;
-}
 
 static void iwl4965_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
 {
@@ -434,38 +196,6 @@ static void iwl4965_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
 
 }
 
-/**
- * iwl4965_rxon_add_station - add station into station table.
- *
- * there is only one AP station with id= IWL_AP_ID
- * NOTE: mutex must be held before calling this fnction
- */
-static int iwl4965_rxon_add_station(struct iwl_priv *priv,
-                               const u8 *addr, int is_ap)
-{
-       u8 sta_id;
-
-       /* Add station to device's station table */
-#ifdef CONFIG_IWL4965_HT
-       struct ieee80211_conf *conf = &priv->hw->conf;
-       struct ieee80211_ht_info *cur_ht_config = &conf->ht_conf;
-
-       if ((is_ap) &&
-           (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) &&
-           (priv->iw_mode == IEEE80211_IF_TYPE_STA))
-               sta_id = iwl4965_add_station_flags(priv, addr, is_ap,
-                                                  0, cur_ht_config);
-       else
-#endif /* CONFIG_IWL4965_HT */
-               sta_id = iwl4965_add_station_flags(priv, addr, is_ap,
-                                                  0, NULL);
-
-       /* Set up default rate scaling table in device's station table */
-       iwl4965_add_station(priv, addr, is_ap);
-
-       return sta_id;
-}
-
 /**
  * iwl4965_check_rxon_cmd - validate RXON structure is valid
  *
@@ -692,7 +422,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
        }
 
        /* Add the broadcast address so we can send broadcast frames */
-       if (iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0) ==
+       if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) ==
            IWL_INVALID_STATION) {
                IWL_ERROR("Error adding BROADCAST address for transmit.\n");
                return -EIO;
@@ -702,7 +432,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
         * add the IWL_AP_ID to the station rate table */
        if (iwl_is_associated(priv) &&
            (priv->iw_mode == IEEE80211_IF_TYPE_STA)) {
-               if (iwl4965_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
+               if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
                    == IWL_INVALID_STATION) {
                        IWL_ERROR("Error adding AP address for transmit.\n");
                        return -EIO;
@@ -800,7 +530,7 @@ static int iwl4965_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_fla
        return iwl_send_cmd(priv, &cmd);
 }
 
-static void iwl4965_clear_free_frames(struct iwl_priv *priv)
+static void iwl_clear_free_frames(struct iwl_priv *priv)
 {
        struct list_head *element;
 
@@ -810,7 +540,7 @@ static void iwl4965_clear_free_frames(struct iwl_priv *priv)
        while (!list_empty(&priv->free_frames)) {
                element = priv->free_frames.next;
                list_del(element);
-               kfree(list_entry(element, struct iwl4965_frame, list));
+               kfree(list_entry(element, struct iwl_frame, list));
                priv->frames_count--;
        }
 
@@ -821,9 +551,9 @@ static void iwl4965_clear_free_frames(struct iwl_priv *priv)
        }
 }
 
-static struct iwl4965_frame *iwl4965_get_free_frame(struct iwl_priv *priv)
+static struct iwl_frame *iwl_get_free_frame(struct iwl_priv *priv)
 {
-       struct iwl4965_frame *frame;
+       struct iwl_frame *frame;
        struct list_head *element;
        if (list_empty(&priv->free_frames)) {
                frame = kzalloc(sizeof(*frame), GFP_KERNEL);
@@ -838,10 +568,10 @@ static struct iwl4965_frame *iwl4965_get_free_frame(struct iwl_priv *priv)
 
        element = priv->free_frames.next;
        list_del(element);
-       return list_entry(element, struct iwl4965_frame, list);
+       return list_entry(element, struct iwl_frame, list);
 }
 
-static void iwl4965_free_frame(struct iwl_priv *priv, struct iwl4965_frame *frame)
+static void iwl_free_frame(struct iwl_priv *priv, struct iwl_frame *frame)
 {
        memset(frame, 0, sizeof(*frame));
        list_add(&frame->list, &priv->free_frames);
@@ -878,9 +608,9 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv)
 
        /* Find lowest valid rate */
        for (i = IWL_RATE_1M_INDEX; i != IWL_RATE_INVALID;
-                                       i = iwl4965_rates[i].next_ieee) {
+                                       i = iwl_rates[i].next_ieee) {
                if (rate_mask & (1 << i))
-                       return iwl4965_rates[i].plcp;
+                       return iwl_rates[i].plcp;
        }
 
        /* No valid rate was found. Assign the lowest one */
@@ -892,12 +622,12 @@ static u8 iwl4965_rate_get_lowest_plcp(struct iwl_priv *priv)
 
 static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
 {
-       struct iwl4965_frame *frame;
+       struct iwl_frame *frame;
        unsigned int frame_size;
        int rc;
        u8 rate;
 
-       frame = iwl4965_get_free_frame(priv);
+       frame = iwl_get_free_frame(priv);
 
        if (!frame) {
                IWL_ERROR("Could not obtain free frame buffer for beacon "
@@ -912,7 +642,7 @@ static int iwl4965_send_beacon_cmd(struct iwl_priv *priv)
        rc = iwl_send_cmd_pdu(priv, REPLY_TX_BEACON, frame_size,
                              &frame->u.cmd[0]);
 
-       iwl4965_free_frame(priv, frame);
+       iwl_free_frame(priv, frame);
 
        return rc;
 }
@@ -939,7 +669,7 @@ static u16 iwl4965_supported_rate_to_ie(u8 *ie, u16 supported_rate,
        for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
                if (bit & supported_rate) {
                        ret_rates |= bit;
-                       rates[*cnt] = iwl4965_rates[i].ieee |
+                       rates[*cnt] = iwl_rates[i].ieee |
                                ((bit & basic_rate) ? 0x80 : 0x00);
                        (*cnt)++;
                        (*left)--;
@@ -970,9 +700,9 @@ static void iwl4965_ht_conf(struct iwl_priv *priv,
        priv->ps_mode = (u8)((ht_conf->cap & IEEE80211_HT_CAP_MIMO_PS) >> 2);
 
        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_20)
-               iwl_conf->sgf |= 0x1;
+               iwl_conf->sgf |= HT_SHORT_GI_20MHZ;
        if (ht_conf->cap & IEEE80211_HT_CAP_SGI_40)
-               iwl_conf->sgf |= 0x2;
+               iwl_conf->sgf |= HT_SHORT_GI_40MHZ;
 
        iwl_conf->is_green_field = !!(ht_conf->cap & IEEE80211_HT_CAP_GRN_FLD);
        iwl_conf->max_amsdu_size =
@@ -1059,9 +789,9 @@ static u16 iwl4965_fill_probe_req(struct iwl_priv *priv,
        len += 24;
 
        frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
-       memcpy(frame->da, iwl4965_broadcast_addr, ETH_ALEN);
+       memcpy(frame->da, iwl_bcast_addr, ETH_ALEN);
        memcpy(frame->sa, priv->mac_addr, ETH_ALEN);
-       memcpy(frame->bssid, iwl4965_broadcast_addr, ETH_ALEN);
+       memcpy(frame->bssid, iwl_bcast_addr, ETH_ALEN);
        frame->seq_ctrl = 0;
 
        /* fill in our indirect SSID IE */
@@ -1569,441 +1299,6 @@ static int iwl4965_set_mode(struct iwl_priv *priv, int mode)
        return 0;
 }
 
-static void iwl4965_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
-                                     struct ieee80211_tx_control *ctl,
-                                     struct iwl_cmd *cmd,
-                                     struct sk_buff *skb_frag,
-                                     int sta_id)
-{
-       struct iwl_hw_key *keyinfo = &priv->stations[sta_id].keyinfo;
-       struct iwl_wep_key *wepkey;
-       int keyidx = 0;
-
-       BUG_ON(ctl->hw_key->hw_key_idx > 3);
-
-       switch (keyinfo->alg) {
-       case ALG_CCMP:
-               cmd->cmd.tx.sec_ctl = TX_CMD_SEC_CCM;
-               memcpy(cmd->cmd.tx.key, keyinfo->key, keyinfo->keylen);
-               if (ctl->flags & IEEE80211_TXCTL_AMPDU)
-                       cmd->cmd.tx.tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
-               IWL_DEBUG_TX("tx_cmd with aes hwcrypto\n");
-               break;
-
-       case ALG_TKIP:
-               cmd->cmd.tx.sec_ctl = TX_CMD_SEC_TKIP;
-               ieee80211_get_tkip_key(keyinfo->conf, skb_frag,
-                       IEEE80211_TKIP_P2_KEY, cmd->cmd.tx.key);
-               IWL_DEBUG_TX("tx_cmd with tkip hwcrypto\n");
-               break;
-
-       case ALG_WEP:
-               wepkey = &priv->wep_keys[ctl->hw_key->hw_key_idx];
-               cmd->cmd.tx.sec_ctl = 0;
-               if (priv->default_wep_key) {
-                       /* the WEP key was sent as static */
-                       keyidx = ctl->hw_key->hw_key_idx;
-                       memcpy(&cmd->cmd.tx.key[3], wepkey->key,
-                                                       wepkey->key_size);
-                       if (wepkey->key_size == WEP_KEY_LEN_128)
-                               cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128;
-               } else {
-                       /* the WEP key was sent as dynamic */
-                       keyidx = keyinfo->keyidx;
-                       memcpy(&cmd->cmd.tx.key[3], keyinfo->key,
-                                                       keyinfo->keylen);
-                       if (keyinfo->keylen == WEP_KEY_LEN_128)
-                               cmd->cmd.tx.sec_ctl |= TX_CMD_SEC_KEY128;
-               }
-
-               cmd->cmd.tx.sec_ctl |= (TX_CMD_SEC_WEP |
-                       (keyidx & TX_CMD_SEC_MSK) << TX_CMD_SEC_SHIFT);
-
-               IWL_DEBUG_TX("Configuring packet for WEP encryption "
-                            "with key %d\n", keyidx);
-               break;
-
-       default:
-               printk(KERN_ERR "Unknown encode alg %d\n", keyinfo->alg);
-               break;
-       }
-}
-
-/*
- * handle build REPLY_TX command notification.
- */
-static void iwl4965_build_tx_cmd_basic(struct iwl_priv *priv,
-                                 struct iwl_cmd *cmd,
-                                 struct ieee80211_tx_control *ctrl,
-                                 struct ieee80211_hdr *hdr,
-                                 int is_unicast, u8 std_id)
-{
-       __le16 *qc;
-       u16 fc = le16_to_cpu(hdr->frame_control);
-       __le32 tx_flags = cmd->cmd.tx.tx_flags;
-
-       cmd->cmd.tx.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
-       if (!(ctrl->flags & IEEE80211_TXCTL_NO_ACK)) {
-               tx_flags |= TX_CMD_FLG_ACK_MSK;
-               if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)
-                       tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-               if (ieee80211_is_probe_response(fc) &&
-                   !(le16_to_cpu(hdr->seq_ctrl) & 0xf))
-                       tx_flags |= TX_CMD_FLG_TSF_MSK;
-       } else {
-               tx_flags &= (~TX_CMD_FLG_ACK_MSK);
-               tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-       }
-
-       if (ieee80211_is_back_request(fc))
-               tx_flags |= TX_CMD_FLG_ACK_MSK | TX_CMD_FLG_IMM_BA_RSP_MASK;
-
-
-       cmd->cmd.tx.sta_id = std_id;
-       if (ieee80211_get_morefrag(hdr))
-               tx_flags |= TX_CMD_FLG_MORE_FRAG_MSK;
-
-       qc = ieee80211_get_qos_ctrl(hdr);
-       if (qc) {
-               cmd->cmd.tx.tid_tspec = (u8) (le16_to_cpu(*qc) & 0xf);
-               tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK;
-       } else
-               tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK;
-
-       if (ctrl->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
-               tx_flags |= TX_CMD_FLG_RTS_MSK;
-               tx_flags &= ~TX_CMD_FLG_CTS_MSK;
-       } else if (ctrl->flags & IEEE80211_TXCTL_USE_CTS_PROTECT) {
-               tx_flags &= ~TX_CMD_FLG_RTS_MSK;
-               tx_flags |= TX_CMD_FLG_CTS_MSK;
-       }
-
-       if ((tx_flags & TX_CMD_FLG_RTS_MSK) || (tx_flags & TX_CMD_FLG_CTS_MSK))
-               tx_flags |= TX_CMD_FLG_FULL_TXOP_PROT_MSK;
-
-       tx_flags &= ~(TX_CMD_FLG_ANT_SEL_MSK);
-       if ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT) {
-               if ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_ASSOC_REQ ||
-                   (fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_REASSOC_REQ)
-                       cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3);
-               else
-                       cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2);
-       } else {
-               cmd->cmd.tx.timeout.pm_frame_timeout = 0;
-       }
-
-       cmd->cmd.tx.driver_txop = 0;
-       cmd->cmd.tx.tx_flags = tx_flags;
-       cmd->cmd.tx.next_frame_len = 0;
-}
-static void iwl_update_tx_stats(struct iwl_priv *priv, u16 fc, u16 len)
-{
-       /* 0 - mgmt, 1 - cnt, 2 - data */
-       int idx = (fc & IEEE80211_FCTL_FTYPE) >> 2;
-       priv->tx_stats[idx].cnt++;
-       priv->tx_stats[idx].bytes += len;
-}
-/**
- * iwl4965_get_sta_id - Find station's index within station table
- *
- * If new IBSS station, create new entry in station table
- */
-static int iwl4965_get_sta_id(struct iwl_priv *priv,
-                               struct ieee80211_hdr *hdr)
-{
-       int sta_id;
-       u16 fc = le16_to_cpu(hdr->frame_control);
-       DECLARE_MAC_BUF(mac);
-
-       /* If this frame is broadcast or management, use broadcast station id */
-       if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) ||
-           is_multicast_ether_addr(hdr->addr1))
-               return priv->hw_params.bcast_sta_id;
-
-       switch (priv->iw_mode) {
-
-       /* If we are a client station in a BSS network, use the special
-        * AP station entry (that's the only station we communicate with) */
-       case IEEE80211_IF_TYPE_STA:
-               return IWL_AP_ID;
-
-       /* If we are an AP, then find the station, or use BCAST */
-       case IEEE80211_IF_TYPE_AP:
-               sta_id = iwl_find_station(priv, hdr->addr1);
-               if (sta_id != IWL_INVALID_STATION)
-                       return sta_id;
-               return priv->hw_params.bcast_sta_id;
-
-       /* If this frame is going out to an IBSS network, find the station,
-        * or create a new station table entry */
-       case IEEE80211_IF_TYPE_IBSS:
-               sta_id = iwl_find_station(priv, hdr->addr1);
-               if (sta_id != IWL_INVALID_STATION)
-                       return sta_id;
-
-               /* Create new station table entry */
-               sta_id = iwl4965_add_station_flags(priv, hdr->addr1,
-                                                  0, CMD_ASYNC, NULL);
-
-               if (sta_id != IWL_INVALID_STATION)
-                       return sta_id;
-
-               IWL_DEBUG_DROP("Station %s not in station map. "
-                              "Defaulting to broadcast...\n",
-                              print_mac(mac, hdr->addr1));
-               iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
-               return priv->hw_params.bcast_sta_id;
-
-       default:
-               IWL_WARNING("Unknown mode of operation: %d", priv->iw_mode);
-               return priv->hw_params.bcast_sta_id;
-       }
-}
-
-/*
- * start REPLY_TX command process
- */
-static int iwl4965_tx_skb(struct iwl_priv *priv,
-                     struct sk_buff *skb, struct ieee80211_tx_control *ctl)
-{
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-       struct iwl_tfd_frame *tfd;
-       u32 *control_flags;
-       int txq_id = ctl->queue;
-       struct iwl_tx_queue *txq = NULL;
-       struct iwl_queue *q = NULL;
-       dma_addr_t phys_addr;
-       dma_addr_t txcmd_phys;
-       dma_addr_t scratch_phys;
-       struct iwl_cmd *out_cmd = NULL;
-       u16 len, idx, len_org;
-       u8 id, hdr_len, unicast;
-       u8 sta_id;
-       u16 seq_number = 0;
-       u16 fc;
-       __le16 *qc;
-       u8 wait_write_ptr = 0;
-       unsigned long flags;
-       int rc;
-
-       spin_lock_irqsave(&priv->lock, flags);
-       if (iwl_is_rfkill(priv)) {
-               IWL_DEBUG_DROP("Dropping - RF KILL\n");
-               goto drop_unlock;
-       }
-
-       if (!priv->vif) {
-               IWL_DEBUG_DROP("Dropping - !priv->vif\n");
-               goto drop_unlock;
-       }
-
-       if ((ctl->tx_rate->hw_value & 0xFF) == IWL_INVALID_RATE) {
-               IWL_ERROR("ERROR: No TX rate available.\n");
-               goto drop_unlock;
-       }
-
-       unicast = !is_multicast_ether_addr(hdr->addr1);
-       id = 0;
-
-       fc = le16_to_cpu(hdr->frame_control);
-
-#ifdef CONFIG_IWLWIFI_DEBUG
-       if (ieee80211_is_auth(fc))
-               IWL_DEBUG_TX("Sending AUTH frame\n");
-       else if (ieee80211_is_assoc_request(fc))
-               IWL_DEBUG_TX("Sending ASSOC frame\n");
-       else if (ieee80211_is_reassoc_request(fc))
-               IWL_DEBUG_TX("Sending REASSOC frame\n");
-#endif
-
-       /* drop all data frame if we are not associated */
-       if (((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) &&
-          (!iwl_is_associated(priv) ||
-           ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && !priv->assoc_id) ||
-           !priv->assoc_station_added)) {
-               IWL_DEBUG_DROP("Dropping - !iwl_is_associated\n");
-               goto drop_unlock;
-       }
-
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       hdr_len = ieee80211_get_hdrlen(fc);
-
-       /* Find (or create) index into station table for destination station */
-       sta_id = iwl4965_get_sta_id(priv, hdr);
-       if (sta_id == IWL_INVALID_STATION) {
-               DECLARE_MAC_BUF(mac);
-
-               IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
-                              print_mac(mac, hdr->addr1));
-               goto drop;
-       }
-
-       IWL_DEBUG_TX("station Id %d\n", sta_id);
-
-       qc = ieee80211_get_qos_ctrl(hdr);
-       if (qc) {
-               u8 tid = (u8)(le16_to_cpu(*qc) & 0xf);
-               seq_number = priv->stations[sta_id].tid[tid].seq_number &
-                               IEEE80211_SCTL_SEQ;
-               hdr->seq_ctrl = cpu_to_le16(seq_number) |
-                       (hdr->seq_ctrl &
-                               __constant_cpu_to_le16(IEEE80211_SCTL_FRAG));
-               seq_number += 0x10;
-#ifdef CONFIG_IWL4965_HT
-               /* aggregation is on for this <sta,tid> */
-               if (ctl->flags & IEEE80211_TXCTL_AMPDU)
-                       txq_id = priv->stations[sta_id].tid[tid].agg.txq_id;
-               priv->stations[sta_id].tid[tid].tfds_in_queue++;
-#endif /* CONFIG_IWL4965_HT */
-       }
-
-       /* Descriptor for chosen Tx queue */
-       txq = &priv->txq[txq_id];
-       q = &txq->q;
-
-       spin_lock_irqsave(&priv->lock, flags);
-
-       /* Set up first empty TFD within this queue's circular TFD buffer */
-       tfd = &txq->bd[q->write_ptr];
-       memset(tfd, 0, sizeof(*tfd));
-       control_flags = (u32 *) tfd;
-       idx = get_cmd_index(q, q->write_ptr, 0);
-
-       /* Set up driver data for this TFD */
-       memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));
-       txq->txb[q->write_ptr].skb[0] = skb;
-       memcpy(&(txq->txb[q->write_ptr].status.control),
-              ctl, sizeof(struct ieee80211_tx_control));
-
-       /* Set up first empty entry in queue's array of Tx/cmd buffers */
-       out_cmd = &txq->cmd[idx];
-       memset(&out_cmd->hdr, 0, sizeof(out_cmd->hdr));
-       memset(&out_cmd->cmd.tx, 0, sizeof(out_cmd->cmd.tx));
-
-       /*
-        * Set up the Tx-command (not MAC!) header.
-        * Store the chosen Tx queue and TFD index within the sequence field;
-        * after Tx, uCode's Tx response will return this value so driver can
-        * locate the frame within the tx queue and do post-tx processing.
-        */
-       out_cmd->hdr.cmd = REPLY_TX;
-       out_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
-                               INDEX_TO_SEQ(q->write_ptr)));
-
-       /* Copy MAC header from skb into command buffer */
-       memcpy(out_cmd->cmd.tx.hdr, hdr, hdr_len);
-
-       /*
-        * Use the first empty entry in this queue's command buffer array
-        * to contain the Tx command and MAC header concatenated together
-        * (payload data will be in another buffer).
-        * Size of this varies, due to varying MAC header length.
-        * If end is not dword aligned, we'll have 2 extra bytes at the end
-        * of the MAC header (device reads on dword boundaries).
-        * We'll tell device about this padding later.
-        */
-       len = priv->hw_params.tx_cmd_len +
-               sizeof(struct iwl_cmd_header) + hdr_len;
-
-       len_org = len;
-       len = (len + 3) & ~3;
-
-       if (len_org != len)
-               len_org = 1;
-       else
-               len_org = 0;
-
-       /* Physical address of this Tx command's header (not MAC header!),
-        * within command buffer array. */
-       txcmd_phys = txq->dma_addr_cmd + sizeof(struct iwl_cmd) * idx +
-                    offsetof(struct iwl_cmd, hdr);
-
-       /* Add buffer containing Tx command and MAC(!) header to TFD's
-        * first entry */
-       iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, txcmd_phys, len);
-
-       if (!(ctl->flags & IEEE80211_TXCTL_DO_NOT_ENCRYPT))
-               iwl4965_build_tx_cmd_hwcrypto(priv, ctl, out_cmd, skb, sta_id);
-
-       /* Set up TFD's 2nd entry to point directly to remainder of skb,
-        * if any (802.11 null frames have no payload). */
-       len = skb->len - hdr_len;
-       if (len) {
-               phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
-                                          len, PCI_DMA_TODEVICE);
-               iwl4965_hw_txq_attach_buf_to_tfd(priv, tfd, phys_addr, len);
-       }
-
-       /* Tell 4965 about any 2-byte padding after MAC header */
-       if (len_org)
-               out_cmd->cmd.tx.tx_flags |= TX_CMD_FLG_MH_PAD_MSK;
-
-       /* Total # bytes to be transmitted */
-       len = (u16)skb->len;
-       out_cmd->cmd.tx.len = cpu_to_le16(len);
-
-       /* TODO need this for burst mode later on */
-       iwl4965_build_tx_cmd_basic(priv, out_cmd, ctl, hdr, unicast, sta_id);
-
-       /* set is_hcca to 0; it probably will never be implemented */
-       iwl4965_hw_build_tx_cmd_rate(priv, out_cmd, ctl, hdr, sta_id, 0);
-
-       iwl_update_tx_stats(priv, fc, len);
-
-       scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
-               offsetof(struct iwl4965_tx_cmd, scratch);
-       out_cmd->cmd.tx.dram_lsb_ptr = cpu_to_le32(scratch_phys);
-       out_cmd->cmd.tx.dram_msb_ptr = iwl_get_dma_hi_address(scratch_phys);
-
-       if (!ieee80211_get_morefrag(hdr)) {
-               txq->need_update = 1;
-               if (qc) {
-                       u8 tid = (u8)(le16_to_cpu(*qc) & 0xf);
-                       priv->stations[sta_id].tid[tid].seq_number = seq_number;
-               }
-       } else {
-               wait_write_ptr = 1;
-               txq->need_update = 0;
-       }
-
-       iwl_print_hex_dump(priv, IWL_DL_TX, out_cmd->cmd.payload,
-                          sizeof(out_cmd->cmd.tx));
-
-       iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr,
-                          ieee80211_get_hdrlen(fc));
-
-       /* Set up entry for this TFD in Tx byte-count array */
-       priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq, len);
-
-       /* Tell device the write index *just past* this latest filled TFD */
-       q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd);
-       rc = iwl4965_tx_queue_update_write_ptr(priv, txq);
-       spin_unlock_irqrestore(&priv->lock, flags);
-
-       if (rc)
-               return rc;
-
-       if ((iwl_queue_space(q) < q->high_mark)
-           && priv->mac80211_registered) {
-               if (wait_write_ptr) {
-                       spin_lock_irqsave(&priv->lock, flags);
-                       txq->need_update = 1;
-                       iwl4965_tx_queue_update_write_ptr(priv, txq);
-                       spin_unlock_irqrestore(&priv->lock, flags);
-               }
-
-               ieee80211_stop_queue(priv->hw, ctl->queue);
-       }
-
-       return 0;
-
-drop_unlock:
-       spin_unlock_irqrestore(&priv->lock, flags);
-drop:
-       return -1;
-}
-
 static void iwl4965_set_rate(struct iwl_priv *priv)
 {
        const struct ieee80211_supported_band *hw = NULL;
@@ -2540,8 +1835,9 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
        u32  status = le32_to_cpu(tx_resp->status);
 #ifdef CONFIG_IWL4965_HT
        int tid = MAX_TID_COUNT, sta_id = IWL_INVALID_STATION;
+       u16 fc;
        struct ieee80211_hdr *hdr;
-       __le16 *qc;
+       u8 *qc = NULL;
 #endif
 
        if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
@@ -2554,10 +1850,11 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
 
 #ifdef CONFIG_IWL4965_HT
        hdr = iwl4965_tx_queue_get_hdr(priv, txq_id, index);
-       qc = ieee80211_get_qos_ctrl(hdr);
-
-       if (qc)
-               tid = le16_to_cpu(*qc) & 0xf;
+       fc = le16_to_cpu(hdr->frame_control);
+       if (ieee80211_is_qos_data(fc)) {
+               qc = ieee80211_get_qos_ctrl(hdr, ieee80211_get_hdrlen(fc));
+               tid = qc[0] & 0xf;
+       }
 
        sta_id = iwl4965_get_ra_sta_id(priv, hdr);
        if (txq->sched_retry && unlikely(sta_id == IWL_INVALID_STATION)) {
@@ -3271,52 +2568,6 @@ int iwl4965_calc_sig_qual(int rssi_dbm, int noise_dbm)
        return sig_qual;
 }
 
-/**
- * iwl4965_tx_queue_update_write_ptr - Send new write index to hardware
- */
-static int iwl4965_tx_queue_update_write_ptr(struct iwl_priv *priv,
-                                 struct iwl_tx_queue *txq)
-{
-       u32 reg = 0;
-       int rc = 0;
-       int txq_id = txq->q.id;
-
-       if (txq->need_update == 0)
-               return rc;
-
-       /* if we're trying to save power */
-       if (test_bit(STATUS_POWER_PMI, &priv->status)) {
-               /* wake up nic if it's powered down ...
-                * uCode will wake up, and interrupt us again, so next
-                * time we'll skip this part. */
-               reg = iwl_read32(priv, CSR_UCODE_DRV_GP1);
-
-               if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
-                       IWL_DEBUG_INFO("Requesting wakeup, GP1 = 0x%x\n", reg);
-                       iwl_set_bit(priv, CSR_GP_CNTRL,
-                                   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-                       return rc;
-               }
-
-               /* restore this queue's parameters in nic hardware. */
-               rc = iwl_grab_nic_access(priv);
-               if (rc)
-                       return rc;
-               iwl_write_direct32(priv, HBUS_TARG_WRPTR,
-                                    txq->q.write_ptr | (txq_id << 8));
-               iwl_release_nic_access(priv);
-
-       /* else not in power-save mode, uCode will never sleep when we're
-        * trying to tx (during RFKILL, we're not trying to tx). */
-       } else
-               iwl_write32(priv, HBUS_TARG_WRPTR,
-                           txq->q.write_ptr | (txq_id << 8));
-
-       txq->need_update = 0;
-
-       return rc;
-}
-
 #ifdef CONFIG_IWLWIFI_DEBUG
 static void iwl4965_print_rx_config_cmd(struct iwl_priv *priv)
 {
@@ -3441,103 +2692,6 @@ static void iwl4965_dump_nic_error_log(struct iwl_priv *priv)
        iwl_release_nic_access(priv);
 }
 
-#define EVENT_START_OFFSET  (4 * sizeof(u32))
-
-/**
- * iwl4965_print_event_log - Dump error event log to syslog
- *
- * NOTE: Must be called with iwl_grab_nic_access() already obtained!
- */
-static void iwl4965_print_event_log(struct iwl_priv *priv, u32 start_idx,
-                               u32 num_events, u32 mode)
-{
-       u32 i;
-       u32 base;       /* SRAM byte address of event log header */
-       u32 event_size; /* 2 u32s, or 3 u32s if timestamp recorded */
-       u32 ptr;        /* SRAM byte address of log data */
-       u32 ev, time, data; /* event log data */
-
-       if (num_events == 0)
-               return;
-
-       base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
-
-       if (mode == 0)
-               event_size = 2 * sizeof(u32);
-       else
-               event_size = 3 * sizeof(u32);
-
-       ptr = base + EVENT_START_OFFSET + (start_idx * event_size);
-
-       /* "time" is actually "data" for mode 0 (no timestamp).
-        * place event id # at far right for easier visual parsing. */
-       for (i = 0; i < num_events; i++) {
-               ev = iwl_read_targ_mem(priv, ptr);
-               ptr += sizeof(u32);
-               time = iwl_read_targ_mem(priv, ptr);
-               ptr += sizeof(u32);
-               if (mode == 0)
-                       IWL_ERROR("0x%08x\t%04u\n", time, ev); /* data, ev */
-               else {
-                       data = iwl_read_targ_mem(priv, ptr);
-                       ptr += sizeof(u32);
-                       IWL_ERROR("%010u\t0x%08x\t%04u\n", time, data, ev);
-               }
-       }
-}
-
-static void iwl4965_dump_nic_event_log(struct iwl_priv *priv)
-{
-       int rc;
-       u32 base;       /* SRAM byte address of event log header */
-       u32 capacity;   /* event log capacity in # entries */
-       u32 mode;       /* 0 - no timestamp, 1 - timestamp recorded */
-       u32 num_wraps;  /* # times uCode wrapped to top of log */
-       u32 next_entry; /* index of next entry to be written by uCode */
-       u32 size;       /* # entries that we'll print */
-
-       base = le32_to_cpu(priv->card_alive.log_event_table_ptr);
-       if (!priv->cfg->ops->lib->is_valid_rtc_data_addr(base)) {
-               IWL_ERROR("Invalid event log pointer 0x%08X\n", base);
-               return;
-       }
-
-       rc = iwl_grab_nic_access(priv);
-       if (rc) {
-               IWL_WARNING("Can not read from adapter at this time.\n");
-               return;
-       }
-
-       /* event log header */
-       capacity = iwl_read_targ_mem(priv, base);
-       mode = iwl_read_targ_mem(priv, base + (1 * sizeof(u32)));
-       num_wraps = iwl_read_targ_mem(priv, base + (2 * sizeof(u32)));
-       next_entry = iwl_read_targ_mem(priv, base + (3 * sizeof(u32)));
-
-       size = num_wraps ? capacity : next_entry;
-
-       /* bail out if nothing in log */
-       if (size == 0) {
-               IWL_ERROR("Start IWL Event Log Dump: nothing in log\n");
-               iwl_release_nic_access(priv);
-               return;
-       }
-
-       IWL_ERROR("Start IWL Event Log Dump: display count %d, wraps %d\n",
-                 size, num_wraps);
-
-       /* if uCode has wrapped back to top of log, start at the oldest entry,
-        * i.e the next one that uCode would fill. */
-       if (num_wraps)
-               iwl4965_print_event_log(priv, next_entry,
-                                   capacity - next_entry, mode);
-
-       /* (then/else) start at top of log */
-       iwl4965_print_event_log(priv, 0, next_entry, mode);
-
-       iwl_release_nic_access(priv);
-}
-
 /**
  * iwl4965_irq_handle_error - called for HW or SW error interrupt from card
  */
@@ -3552,7 +2706,7 @@ static void iwl4965_irq_handle_error(struct iwl_priv *priv)
 #ifdef CONFIG_IWLWIFI_DEBUG
        if (priv->debug_level & IWL_DL_FW_ERRORS) {
                iwl4965_dump_nic_error_log(priv);
-               iwl4965_dump_nic_event_log(priv);
+               iwl_dump_nic_event_log(priv);
                iwl4965_print_rx_config_cmd(priv);
        }
 #endif
@@ -3586,7 +2740,7 @@ static void iwl4965_error_recovery(struct iwl_priv *priv)
        priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
        iwl4965_commit_rxon(priv);
 
-       iwl4965_rxon_add_station(priv, priv->bssid, 1);
+       iwl_rxon_add_station(priv, priv->bssid, 1);
 
        spin_lock_irqsave(&priv->lock, flags);
        priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
@@ -3706,12 +2860,12 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
        if (inta & CSR_INT_BIT_WAKEUP) {
                IWL_DEBUG_ISR("Wakeup interrupt\n");
                iwl_rx_queue_update_write_ptr(priv, &priv->rxq);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[0]);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[1]);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[2]);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[3]);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[4]);
-               iwl4965_tx_queue_update_write_ptr(priv, &priv->txq[5]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[0]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[1]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[2]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[3]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[4]);
+               iwl_txq_update_write_ptr(priv, &priv->txq[5]);
 
                handled |= CSR_INT_BIT_WAKEUP;
        }
@@ -3727,6 +2881,9 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
        if (inta & CSR_INT_BIT_FH_TX) {
                IWL_DEBUG_ISR("Tx interrupt\n");
                handled |= CSR_INT_BIT_FH_TX;
+               /* FH finished to write, send event */
+               priv->ucode_write_complete = 1;
+               wake_up_interruptible(&priv->wait_command_queue);
        }
 
        if (inta & ~handled)
@@ -4355,7 +3512,7 @@ static void __iwl4965_down(struct iwl_priv *priv)
        priv->ibss_beacon = NULL;
 
        /* clear out any free frames */
-       iwl4965_clear_free_frames(priv);
+       iwl_clear_free_frames(priv);
 }
 
 static void iwl4965_down(struct iwl_priv *priv)
@@ -4912,8 +4069,8 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
                /* clear out the station table */
                iwlcore_clear_stations_table(priv);
 
-               iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0);
-               iwl4965_rxon_add_station(priv, priv->bssid, 0);
+               iwl_rxon_add_station(priv, iwl_bcast_addr, 0);
+               iwl_rxon_add_station(priv, priv->bssid, 0);
                iwl4965_rate_scale_init(priv->hw, IWL_STA_ID);
                iwl4965_send_beacon_cmd(priv);
 
@@ -5126,7 +4283,7 @@ static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
        IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,
                     ctl->tx_rate->bitrate);
 
-       if (iwl4965_tx_skb(priv, skb, ctl))
+       if (iwl_tx_skb(priv, skb, ctl))
                dev_kfree_skb_any(skb);
 
        IWL_DEBUG_MAC80211("leave\n");
@@ -5324,7 +4481,7 @@ static void iwl4965_config_ap(struct iwl_priv *priv)
                priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
                iwl4965_commit_rxon(priv);
                iwl4965_activate_qos(priv, 1);
-               iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0);
+               iwl_rxon_add_station(priv, iwl_bcast_addr, 0);
        }
        iwl4965_send_beacon_cmd(priv);
 
@@ -5413,7 +4570,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                else {
                        rc = iwl4965_commit_rxon(priv);
                        if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
-                               iwl4965_rxon_add_station(
+                               iwl_rxon_add_station(
                                        priv, priv->active_rxon.bssid_addr, 1);
                }
 
@@ -5700,7 +4857,8 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                if (cmd == SET_KEY)
                        is_default_wep_key = !priv->key_mapping_key;
                else
-                       is_default_wep_key = priv->default_wep_key;
+                       is_default_wep_key =
+                                       (key->hw_key_idx == HW_KEY_DEFAULT);
        }
 
        switch (cmd) {
@@ -6385,20 +5543,6 @@ static ssize_t dump_error_log(struct device *d,
 
 static DEVICE_ATTR(dump_errors, S_IWUSR, NULL, dump_error_log);
 
-static ssize_t dump_event_log(struct device *d,
-                             struct device_attribute *attr,
-                             const char *buf, size_t count)
-{
-       char *p = (char *)buf;
-
-       if (p[0] == '1')
-               iwl4965_dump_nic_event_log((struct iwl_priv *)d->driver_data);
-
-       return strnlen(buf, count);
-}
-
-static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
-
 /*****************************************************************************
  *
  * driver setup and teardown
@@ -6445,7 +5589,6 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
 static struct attribute *iwl4965_sysfs_entries[] = {
        &dev_attr_channels.attr,
        &dev_attr_dump_errors.attr,
-       &dev_attr_dump_events.attr,
        &dev_attr_flags.attr,
        &dev_attr_filter_flags.attr,
 #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
@@ -6623,10 +5766,10 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        }
 
        /*******************
-        * 6. Setup hw/priv
+        * 6. Setup priv
         *******************/
 
-       err = iwl_setup(priv);
+       err = iwl_init_drv(priv);
        if (err)
                goto out_free_eeprom;
        /* At this point both hw and priv are initialized. */
@@ -6641,9 +5784,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
                IWL_DEBUG_INFO("Radio disabled.\n");
        }
 
-       if (priv->cfg->mod_params->enable_qos)
-               priv->qos_data.qos_enable = 1;
-
        /********************
         * 8. Setup services
         ********************/
@@ -6654,14 +5794,9 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        err = sysfs_create_group(&pdev->dev.kobj, &iwl4965_attribute_group);
        if (err) {
                IWL_ERROR("failed to create sysfs device attributes\n");
-               goto out_free_eeprom;
+               goto out_uninit_drv;
        }
 
-       err = iwl_dbgfs_register(priv, DRV_NAME);
-       if (err) {
-               IWL_ERROR("failed to create debugfs files\n");
-               goto out_remove_sysfs;
-       }
 
        iwl4965_setup_deferred_work(priv);
        iwl4965_setup_rx_handlers(priv);
@@ -6672,12 +5807,26 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        pci_save_state(pdev);
        pci_disable_device(pdev);
 
+       /**********************************
+        * 10. Setup and register mac80211
+        **********************************/
+
+       err = iwl_setup_mac(priv);
+       if (err)
+               goto out_remove_sysfs;
+
+       err = iwl_dbgfs_register(priv, DRV_NAME);
+       if (err)
+               IWL_ERROR("failed to create debugfs files\n");
+
        /* notify iwlcore to init */
        iwlcore_low_level_notify(priv, IWLCORE_INIT_EVT);
        return 0;
 
  out_remove_sysfs:
        sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group);
+ out_uninit_drv:
+       iwl_uninit_drv(priv);
  out_free_eeprom:
        iwl_eeprom_free(priv);
  out_iounmap:
@@ -6759,8 +5908,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
        pci_disable_device(pdev);
        pci_set_drvdata(pdev, NULL);
 
-       iwl_free_channel_map(priv);
-       iwlcore_free_geos(priv);
+       iwl_uninit_drv(priv);
 
        if (priv->ibss_beacon)
                dev_kfree_skb(priv->ibss_beacon);