Skip to content

Commit

Permalink
iwlegacy: get rid of ctx->ac_to_queue
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Stanislaw Gruszka authored and John W. Linville committed Feb 6, 2012
1 parent b75b3a7 commit eb123af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
8 changes: 2 additions & 6 deletions drivers/net/wireless/iwlegacy/4965-mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
{
Expand All @@ -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);

Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/iwlegacy/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eb123af

Please sign in to comment.