iwlegacy: get rid of mcast_queue

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 3209970cf45f4b759529629183fe1a7e25bbf670..ecb7b542b96c1941edc72349b69a2a62d63f7aa8 100644 (file)
--- 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 8df2286ea05f9fc609f5d2f675b30b7ea5f6d1d5..89922e0a70daed94c5ee4cc111798ac5999a223c 100644 (file)
--- 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;