iwlegacy: get rid of ctx->ac_to_queue

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 731bb8c10b451db7cf499867c59276abf5780947..1c3c85ec11176bbcd4afa03cca03ff5e30021dee 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -1718,7 +1718,8 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
        /* FIXME: remove me ? */
        WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM);
 
-       txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
+       /* Access category (AC) is also the queue number */
+       txq_id = skb_get_queue_mapping(skb);
 
        /* irqs already disabled/saved above when locking il->lock */
        spin_lock(&il->sta_lock);
@@ -6111,10 +6112,6 @@ il4965_set_hw_params(struct il_priv *il)
        return il->cfg->ops->lib->set_hw_params(il);
 }
 
-static const u8 il4965_bss_ac_to_queue[] = {
-       0, 1, 2, 3,
-};
-
 static int
 il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -6139,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        il->ctx.always_active = true;
        il->ctx.is_active = true;
-       il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
 
        SET_IEEE80211_DEV(hw, &pdev->dev);
 

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index e0e4d013660145cfbae0a173c8a57ca7115c92fb..e085131a4572a451ff0fa631eb12c9fdd4ecff12 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1155,8 +1155,6 @@ struct il_force_reset {
 struct il_rxon_context {
        struct ieee80211_vif *vif;
 
-       const u8 *ac_to_queue;
-
        /*
         * We could use the vif to indicate active, but we
         * also need it to be active during disabling when