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

[linux-2.6-block.git] / drivers / net / wireless / intel / iwlwifi / mvm / utils.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index 72cd5b3f2d8d2b863ebbd0fbe0bdc1e46462e54a..9ecd5f09615a64a34f220dcad8775568b022cde5 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -238,6 +238,18 @@ u8 iwl_mvm_mac80211_idx_to_hwrate(int rate_idx)
        return fw_rate_idx_to_plcp[rate_idx];
 }
 
+u8 iwl_mvm_mac80211_ac_to_ucode_ac(enum ieee80211_ac_numbers ac)
+{
+       static const u8 mac80211_ac_to_ucode_ac[] = {
+               AC_VO,
+               AC_VI,
+               AC_BE,
+               AC_BK
+       };
+
+       return mac80211_ac_to_ucode_ac[ac];
+}
+
 void iwl_mvm_rx_fw_error(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 {
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
@@ -457,10 +469,10 @@ static void iwl_mvm_dump_umac_error_log(struct iwl_mvm *mvm)
 {
        struct iwl_trans *trans = mvm->trans;
        struct iwl_umac_error_event_table table;
-       u32 base = mvm->trans->umac_error_event_table;
+       u32 base = mvm->trans->dbg.umac_error_event_table;
 
        if (!mvm->support_umac_log &&
-           !(mvm->trans->error_event_table_tlv_status &
+           !(mvm->trans->dbg.error_event_table_tlv_status &
              IWL_ERROR_EVENT_TABLE_UMAC))
                return;
 
@@ -496,7 +508,7 @@ static void iwl_mvm_dump_lmac_error_log(struct iwl_mvm *mvm, u8 lmac_num)
 {
        struct iwl_trans *trans = mvm->trans;
        struct iwl_error_event_table table;
-       u32 val, base = mvm->trans->lmac_error_event_table[lmac_num];
+       u32 val, base = mvm->trans->dbg.lmac_error_event_table[lmac_num];
 
        if (mvm->fwrt.cur_fw_img == IWL_UCODE_INIT) {
                if (!base)
@@ -592,7 +604,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 
        iwl_mvm_dump_lmac_error_log(mvm, 0);
 
-       if (mvm->trans->lmac_error_event_table[1])
+       if (mvm->trans->dbg.lmac_error_event_table[1])
                iwl_mvm_dump_lmac_error_log(mvm, 1);
 
        iwl_mvm_dump_umac_error_log(mvm);