Commit 81a86e1b authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

iwlwifi: provide gso_type to GSO packets 



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: 3d5b459b ("net: tso: add UDP segmentation support")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarBen Greear <greearb@candelatech.com>
Tested-by: default avatarBen Greear <greearb@candelatech.com>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
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: default avatarJakub Kicinski <kuba@kernel.org>
parent 07d46d93

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -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;