Commit eb123af3 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville

iwlegacy: get rid of ctx->ac_to_queue

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b75b3a70
...@@ -1718,7 +1718,8 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) ...@@ -1718,7 +1718,8 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
/* FIXME: remove me ? */ /* FIXME: remove me ? */
WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM); 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 */ /* irqs already disabled/saved above when locking il->lock */
spin_lock(&il->sta_lock); spin_lock(&il->sta_lock);
...@@ -6111,10 +6112,6 @@ il4965_set_hw_params(struct il_priv *il) ...@@ -6111,10 +6112,6 @@ il4965_set_hw_params(struct il_priv *il)
return il->cfg->ops->lib->set_hw_params(il); return il->cfg->ops->lib->set_hw_params(il);
} }
static const u8 il4965_bss_ac_to_queue[] = {
0, 1, 2, 3,
};
static int static int
il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 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) ...@@ -6139,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
il->ctx.always_active = true; il->ctx.always_active = true;
il->ctx.is_active = true; il->ctx.is_active = true;
il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
SET_IEEE80211_DEV(hw, &pdev->dev); SET_IEEE80211_DEV(hw, &pdev->dev);
......
...@@ -1155,8 +1155,6 @@ struct il_force_reset { ...@@ -1155,8 +1155,6 @@ struct il_force_reset {
struct il_rxon_context { struct il_rxon_context {
struct ieee80211_vif *vif; struct ieee80211_vif *vif;
const u8 *ac_to_queue;
/* /*
* We could use the vif to indicate active, but we * We could use the vif to indicate active, but we
* also need it to be active during disabling when * also need it to be active during disabling when
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment