| Message ID | 177785418cf407808bf3a44760302d0647076990.1623961575.git.ryder.lee@mediatek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [v2,1/3] mac80211: check per vif offload_flags in Tx path | expand |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 0a4bc9e08637..db0d26d19f91 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3267,6 +3267,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;
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: Ryder Lee <ryder.lee@mediatek.com> --- v2: drop a TX_FRAG_LIST condition --- net/mac80211/tx.c | 3 +++ 1 file changed, 3 insertions(+)