Commit cc20ff2c authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

mac80211: swap NEED_TXPROCESSING and HW_80211_ENCAP tx flags 



In order to unify the tx status path, the hw 802.11 encapsulation flag
needs to survive the trip to the tx status call.
Since we don't have any free bits in info->flags, we need to move one.
IEEE80211_TX_INTFL_NEED_TXPROCESSING is only used internally in mac80211,
and only before the call into the driver.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20200908123702.88454-10-nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c74114d7

drivers/net/wireless/ath/ath11k/dp_tx.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb) 
	if (test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags))

		return HAL_TCL_ENCAP_TYPE_RAW;



	if (tx_info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP)

	if (tx_info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)

		return HAL_TCL_ENCAP_TYPE_ETHERNET;



	return HAL_TCL_ENCAP_TYPE_NATIVE_WIFI;
@@ -98,7 +98,7 @@ int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, 
	if (test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))

		return -ESHUTDOWN;



	if (!(info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) &&

	if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) &&

	    !ieee80211_is_data(hdr->frame_control))

		return -ENOTSUPP;

drivers/net/wireless/ath/ath11k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -3936,7 +3936,7 @@ static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, 
		return -ENOSPC;



	info = IEEE80211_SKB_CB(skb);

	if (!(info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP)) {

	if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)) {

		if ((ieee80211_is_action(hdr->frame_control) ||

		     ieee80211_is_deauth(hdr->frame_control) ||

		     ieee80211_is_disassoc(hdr->frame_control)) &&
@@ -4063,7 +4063,7 @@ static void ath11k_mac_op_tx(struct ieee80211_hw *hw, 
	bool is_prb_rsp;

	int ret;



	if (info->control.flags & IEEE80211_TX_CTRL_HW_80211_ENCAP) {

	if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) {

		skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP;

	} else if (ieee80211_is_mgmt(hdr->frame_control)) {

		is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control);

include/net/mac80211.h

+7 −7
Original line number Diff line number Diff line
@@ -720,9 +720,8 @@ struct ieee80211_bss_conf { 
 * @IEEE80211_TX_INTFL_OFFCHAN_TX_OK: Internal to mac80211. Used to indicate

 *	that a frame can be transmitted while the queues are stopped for

 *	off-channel operation.

 * @IEEE80211_TX_INTFL_NEED_TXPROCESSING: completely internal to mac80211,

 *	used to indicate that a pending frame requires TX processing before

 *	it can be sent out.

 * @IEEE80211_TX_CTL_HW_80211_ENCAP: This frame uses hardware encapsulation

 *	(header conversion)

 * @IEEE80211_TX_INTFL_RETRIED: completely internal to mac80211,

 *	used to indicate that a frame was already retried due to PS

 * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
@@ -791,7 +790,7 @@ enum mac80211_tx_info_flags { 
	IEEE80211_TX_STAT_AMPDU_NO_BACK		= BIT(11),

	IEEE80211_TX_CTL_RATE_CTRL_PROBE	= BIT(12),

	IEEE80211_TX_INTFL_OFFCHAN_TX_OK	= BIT(13),

	IEEE80211_TX_INTFL_NEED_TXPROCESSING	= BIT(14),

	IEEE80211_TX_CTL_HW_80211_ENCAP		= BIT(14),

	IEEE80211_TX_INTFL_RETRIED		= BIT(15),

	IEEE80211_TX_INTFL_DONT_ENCRYPT		= BIT(16),

	IEEE80211_TX_CTL_NO_PS_BUFFER		= BIT(17),
@@ -823,8 +822,9 @@ enum mac80211_tx_info_flags { 
 * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame

 * @IEEE80211_TX_CTRL_FAST_XMIT: This frame is going through the fast_xmit path

 * @IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP: This frame skips mesh path lookup

 * @IEEE80211_TX_CTRL_HW_80211_ENCAP: This frame uses hardware encapsulation

 *	(header conversion)

 * @IEEE80211_TX_INTCFL_NEED_TXPROCESSING: completely internal to mac80211,

 *	used to indicate that a pending frame requires TX processing before

 *	it can be sent out.

 * @IEEE80211_TX_CTRL_NO_SEQNO: Do not overwrite the sequence number that

 *	has already been assigned to this frame.

 *
@@ -837,7 +837,7 @@ enum mac80211_tx_control_flags { 
	IEEE80211_TX_CTRL_AMSDU			= BIT(3),

	IEEE80211_TX_CTRL_FAST_XMIT		= BIT(4),

	IEEE80211_TX_CTRL_SKIP_MPATH_LOOKUP	= BIT(5),

	IEEE80211_TX_CTRL_HW_80211_ENCAP	= BIT(6),

	IEEE80211_TX_INTCFL_NEED_TXPROCESSING	= BIT(6),

	IEEE80211_TX_CTRL_NO_SEQNO		= BIT(7),

};

net/mac80211/mesh_hwmp.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void prepare_frame_for_deferred_tx(struct ieee80211_sub_if_data *sdata, 
	skb->priority = 7;



	info->control.vif = &sdata->vif;

	info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;

	info->control.flags |= IEEE80211_TX_INTCFL_NEED_TXPROCESSING;

	ieee80211_set_qos_hdr(sdata, skb);

	ieee80211_mps_set_frame_flags(sdata, NULL, hdr);

}
@@ -1163,7 +1163,7 @@ int mesh_nexthop_resolve(struct ieee80211_sub_if_data *sdata, 
	if (skb_queue_len(&mpath->frame_queue) >= MESH_FRAME_QUEUE_LEN)

		skb_to_free = skb_dequeue(&mpath->frame_queue);



	info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;

	info->control.flags |= IEEE80211_TX_INTCFL_NEED_TXPROCESSING;

	ieee80211_set_qos_hdr(sdata, skb);

	skb_queue_tail(&mpath->frame_queue, skb);

	if (skb_to_free)

net/mac80211/mesh_ps.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static void mpsp_qos_null_append(struct sta_info *sta, 


	info = IEEE80211_SKB_CB(new_skb);

	info->control.vif = &sdata->vif;

	info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;

	info->control.flags |= IEEE80211_TX_INTCFL_NEED_TXPROCESSING;



	__skb_queue_tail(frames, new_skb);

}