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

Commit 8f66e064 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: use the new get_tid function 



This saves some typing and is overall more readable.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9c4f7d51

drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

+3 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static inline int iwl_mvm_check_pn(struct iwl_mvm *mvm, struct sk_buff *skb, 
		return -1;



	if (ieee80211_is_data_qos(hdr->frame_control))

		tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

		tid = ieee80211_get_tid(hdr);

	else

		tid = 0;
@@ -347,8 +347,7 @@ static bool iwl_mvm_is_dup(struct ieee80211_sta *sta, int queue, 


	if (ieee80211_is_data_qos(hdr->frame_control))

		/* frame has qos control */

		tid = *ieee80211_get_qos_ctl(hdr) &

			IEEE80211_QOS_CTL_TID_MASK;

		tid = ieee80211_get_tid(hdr);

	else

		tid = IWL_MAX_TID_COUNT;
@@ -628,7 +627,7 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, 
	bool amsdu = desc->mac_flags2 & IWL_RX_MPDU_MFLG2_AMSDU;

	bool last_subframe =

		desc->amsdu_info & IWL_RX_MPDU_AMSDU_LAST_SUBFRAME;

	u8 tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;

	u8 tid = ieee80211_get_tid(hdr);

	u8 sub_frame_idx = desc->amsdu_info &

			   IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK;

	struct iwl_mvm_reorder_buf_entry *entries;

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+4 −7
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb, 
	u16 snap_ip_tcp, pad;

	unsigned int dbg_max_amsdu_len;

	netdev_features_t netdev_flags = NETIF_F_CSUM_MASK | NETIF_F_SG;

	u8 *qc, tid, txf;

	u8 tid, txf;



	snap_ip_tcp = 8 + skb_transport_header(skb) - skb_network_header(skb) +

		tcp_hdrlen(skb);
@@ -790,8 +790,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb, 
		return iwl_mvm_tx_tso_segment(skb, 1, netdev_flags, mpdus_skb);

	}



	qc = ieee80211_get_qos_ctl(hdr);

	tid = *qc & IEEE80211_QOS_CTL_TID_MASK;

	tid = ieee80211_get_tid(hdr);

	if (WARN_ON_ONCE(tid >= IWL_MAX_TID_COUNT))

		return -EINVAL;
@@ -846,7 +845,7 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb, 
	 */

	num_subframes = (max_amsdu_len + pad) / (subf_len + pad);

	if (num_subframes > 1)

		*qc |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;

		*ieee80211_get_qos_ctl(hdr) |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;



	tcp_payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -

		tcp_hdrlen(skb) + skb->data_len;
@@ -1007,9 +1006,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
	 * assignment of MGMT TID

	 */

	if (ieee80211_is_data_qos(fc) && !ieee80211_is_qos_nullfunc(fc)) {

		u8 *qc = NULL;

		qc = ieee80211_get_qos_ctl(hdr);

		tid = qc[0] & IEEE80211_QOS_CTL_TID_MASK;

		tid = ieee80211_get_tid(hdr);

		if (WARN_ON_ONCE(tid >= IWL_MAX_TID_COUNT))

			goto drop_unlock_sta;