Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1e14e94 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: get rid of mcast_queue 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6aa0c254

drivers/net/wireless/iwlegacy/4965-mac.c

+4 −13
Original line number Diff line number Diff line
@@ -1708,18 +1708,9 @@ 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

	/* 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 */

drivers/net/wireless/iwlegacy/common.h

+0 −3
Original line number Diff line number Diff line
@@ -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;