From: Stanislaw Gruszka Date: Fri, 3 Feb 2012 16:31:47 +0000 (+0100) Subject: iwlegacy: get rid of mcast_queue X-Git-Tag: v3.4-rc1~177^2~112^2~305 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=d1e14e942430cd42df9913337aebbcaef53e4515;p=cascardo%2Flinux.git iwlegacy: get rid of mcast_queue Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 3209970cf45f..ecb7b542b96c 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -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); } - /* - * Send this frame after DTIM -- there's a special queue - * reserved for this for contexts that support AP mode. - */ - 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)]; + /* 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)]; /* irqs already disabled/saved above when locking il->lock */ spin_lock(&il->sta_lock); diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index 8df2286ea05f..89922e0a70da 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h @@ -1157,7 +1157,6 @@ struct il_rxon_context { const u8 *ac_to_fifo; const u8 *ac_to_queue; - u8 mcast_queue; /* * We could use the vif to indicate active, but we @@ -1166,8 +1165,6 @@ struct il_rxon_context { */ bool always_active, is_active; - bool ht_need_multiple_chains; - u32 interface_modes, exclusive_interface_modes; struct il_qos_info qos_data;