diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 17:31:53 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:56:07 -0500 |
| commit | b75b3a70a623e6c39512e3ed9a0fd76cea19c085 (patch) | |
| tree | 8472a666de6974564d2f82da07a33bf321c59156 /drivers/net | |
| parent | 1c03c4620edc551b5bbcc87c7aca02b482d8bc51 (diff) | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 17 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 94984c850e8..731bb8c10b4 100644 --- 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 df4d1602289..e0e4d013660 100644 --- 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; /* |