UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlegacy: get rid of mcast_queue 

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stanislaw Gruszka 2012-02-03 17:31:47 +01:00 committed by John W. Linville
parent 6aa0c25435
commit d1e14e9424
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/iwlegacy/4965-mac.c
View File

@ -1708,19 +1708,10 @@ il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
il4965_sta_modify_sleep_tx_count(il, sta_id, 1); il4965_sta_modify_sleep_tx_count(il, sta_id, 1);
} }
/* /* FIXME: remove me ? */
* Send this frame after DTIM -- there's a special queue WARN_ON_ONCE(info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM);
* reserved for this for contexts that support AP mode.
*/ txq_id = ctx->ac_to_queue[skb_get_queue_mapping(skb)];
if (info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM) {
txq_id = ctx->mcast_queue;
/*
* The microcode will clear the more data
* bit in the last frame it transmits.
*/
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
} else
txq_id = ctx->ac_to_queue[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);

3
drivers/net/wireless/iwlegacy/common.h
View File

@ -1157,7 +1157,6 @@ struct il_rxon_context {
const u8 *ac_to_fifo; const u8 *ac_to_fifo;
const u8 *ac_to_queue; const u8 *ac_to_queue;
u8 mcast_queue;
/* /*
* We could use the vif to indicate active, but we * We could use the vif to indicate active, but we
@ -1166,8 +1165,6 @@ struct il_rxon_context {
*/ */
bool always_active, is_active; bool always_active, is_active;
bool ht_need_multiple_chains;
u32 interface_modes, exclusive_interface_modes; u32 interface_modes, exclusive_interface_modes;
struct il_qos_info qos_data; struct il_qos_info qos_data;