iwlegacy: get rid of ctx->ac_to_fifo

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 94984c850e846f36f9d83495c9b42e501338efb4..731bb8c10b451db7cf499867c59276abf5780947 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -1458,8 +1458,15 @@ il4965_get_ac_from_tid(u16 tid)
 static inline int
 il4965_get_fifo_from_tid(struct il_rxon_context *ctx, u16 tid)
 {
+       const u8 ac_to_fifo[] = {
+               IL_TX_FIFO_VO,
+               IL_TX_FIFO_VI,
+               IL_TX_FIFO_BE,
+               IL_TX_FIFO_BK,
+       };
+
        if (likely(tid < ARRAY_SIZE(tid_to_ac)))
-               return ctx->ac_to_fifo[tid_to_ac[tid]];
+               return ac_to_fifo[tid_to_ac[tid]];
 
        /* no support for TIDs 8-15 yet */
        return -EINVAL;
@@ -6104,13 +6111,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_fifo[] = {
-       IL_TX_FIFO_VO,
-       IL_TX_FIFO_VI,
-       IL_TX_FIFO_BE,
-       IL_TX_FIFO_BK,
-};
-
 static const u8 il4965_bss_ac_to_queue[] = {
        0, 1, 2, 3,
 };
@@ -6139,7 +6139,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_fifo = il4965_bss_ac_to_fifo;
        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 df4d1602289c7ced959d1542f1bbd0f7c1754de7..e0e4d013660145cfbae0a173c8a57ca7115c92fb 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1155,7 +1155,6 @@ struct il_force_reset {
 struct il_rxon_context {
        struct ieee80211_vif *vif;
 
-       const u8 *ac_to_fifo;
        const u8 *ac_to_queue;
 
        /*