On 1/25/21 7:09 AM, Eric Dumazet wrote:
From: Eric Dumazet <eduma...@google.com>
net/core/tso.c got recent support for USO, and this broke iwlfifi
because the driver implemented a limited form of GSO.
Providing ->gso_type allows for skb_is_gso_tcp() to provide
a correct result.
Fixes: 3d5b459ba0e3 ("net: tso: add UDP segmentation support")
Signed-off-by: Eric Dumazet <eduma...@google.com>
Reported-by: Ben Greear <gree...@candelatech.com>
Bisected-by: Ben Greear <gree...@candelatech.com>
I appreciate the credit, but the bisect and some other initial bug hunting was
done by people on this thread:
https://bugzilla.kernel.org/show_bug.cgi?id=209913
Thanks,
Ben
Tested-by: Ben Greear <gree...@candelatech.com>
Cc: Luca Coelho <luciano.coe...@intel.com>
Cc: linux-wirel...@vger.kernel.org
Cc: Johannes Berg <johan...@sipsolutions.net>
---
drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index
a983c215df310776ffe67f3b3ffa203eab609bfc..3712adc3ccc2511d46bcc855efbfba41c487d8e6
100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -773,6 +773,7 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int
num_subframes,
next = skb_gso_segment(skb, netdev_flags);
skb_shinfo(skb)->gso_size = mss;
+ skb_shinfo(skb)->gso_type = ipv4 ? SKB_GSO_TCPV4 : SKB_GSO_TCPV6;
if (WARN_ON_ONCE(IS_ERR(next)))
return -EINVAL;
else if (next)
@@ -795,6 +796,8 @@ iwl_mvm_tx_tso_segment(struct sk_buff *skb, unsigned int
num_subframes,
if (tcp_payload_len > mss) {
skb_shinfo(tmp)->gso_size = mss;
+ skb_shinfo(tmp)->gso_type = ipv4 ? SKB_GSO_TCPV4 :
+ SKB_GSO_TCPV6;
} else {
if (qos) {
u8 *qc;
--
Ben Greear <gree...@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
