diff options
| author | Stanislaw Gruszka | 2012-02-03 17:31:54 +0100 |
|---|---|---|
| committer | John W. Linville | 2012-02-06 14:56:08 -0500 |
| commit | eb123af3d1e038c486fc8fcf19518133883792d5 (patch) | |
| tree | 284286ef4e46a874c21107d9a38f58b54f720545 /drivers | |
| parent | b75b3a70a623e6c39512e3ed9a0fd76cea19c085 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 731bb8c10b45..1c3c85ec1117 100644 --- 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 e0e4d0136601..e085131a4572 100644 --- 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 |