From 405660309ff95f9d041b8fc97100d40ad38f092b Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 2 Feb 2021 04:40:27 -0800 Subject: Updated to 5.10.12 --- 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 0003-iwlwifi-provide-gso_type-to-GSO-packets.patch (limited to '0003-iwlwifi-provide-gso_type-to-GSO-packets.patch') diff --git a/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch new file mode 100644 index 0000000..594302d --- /dev/null +++ b/0003-iwlwifi-provide-gso_type-to-GSO-packets.patch @@ -0,0 +1,52 @@ +From 545d6504ef3c786b8294ca2129111227a7bb6515 Mon Sep 17 00:00:00 2001 +From: Eric Dumazet +Date: Mon, 25 Jan 2021 07:09:49 -0800 +Subject: iwlwifi: provide gso_type to GSO packets + +commit 81a86e1bd8e7060ebba1718b284d54f1238e9bf9 upstream. + +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 +Reported-by: Ben Greear +Tested-by: Ben Greear +Cc: Luca Coelho +Cc: Johannes Berg +Link: https://bugzilla.kernel.org/show_bug.cgi?id=209913 +Link: https://lore.kernel.org/r/20210125150949.619309-1-eric.dumazet@gmail.com +Signed-off-by: Jakub Kicinski +Cc: Robert Hancock +Signed-off-by: Greg Kroah-Hartman +--- + 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 fe1c538cd718..7626117c01fa 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +@@ -833,6 +833,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) +@@ -855,6 +856,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; +-- +cgit v1.2.3-1-gf6bb5 + -- cgit v1.2.1