Commit 4f2e3eb6 authored by Ryder Lee's avatar Ryder Lee Committed by Johannes Berg
Browse files

mac80211: check per vif offload_flags in Tx path 



offload_flags has been introduced to indicate encap status of each interface.
An interface can encap offload at runtime, or if it has some extra limitations
it can simply override the flags, so it's more flexible to check offload_flags
in Tx path.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Link: https://lore.kernel.org/r/177785418cf407808bf3a44760302d0647076990.1623961575.git.ryder.lee@mediatek.com


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

net/mac80211/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -3287,6 +3287,9 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	if (!ieee80211_hw_check(&local->hw, TX_AMSDU))

		return false;



	if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED)

		return false;



	if (skb_is_gso(skb))

		return false;