Skip to contentSkip to conversation

Patch "iwlwifi: mvm: checksum IPv6 fragmented packet" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 4, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iwlwifi: mvm: checksum IPv6 fragmented packet

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iwlwifi-mvm-checksum-ipv6-fragmented-packet.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ecf51424152bad1b2727409f42ddf1bd86f44b7d Mon Sep 17 00:00:00 2001

From: Sara Sharon <[email protected]>
Date: Wed, 8 Jun 2016 15:15:41 +0300
Subject: iwlwifi: mvm: checksum IPv6 fragmented packet

From: Sara Sharon <[email protected]>

commit ecf51424152bad1b2727409f42ddf1bd86f44b7d upstream.

Our HW does not support checksum of fragmented packets. Fix code accordingly to checksum those packets in the driver.

Fixes 5e6a98dc4863 ("iwlwifi: mvm: enable TCP/UDP checksum support for 9000 family")
---
 drivers/net/wireless/intel/iwlwifi/mvm/tx.c |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/tx.c +6 -15
@@ -138,28 +138,19 @@ static void iwl_mvm_tx_csum(struct iwl_m
 
 		protocol = ipv6h->nexthdr;
 		while (protocol != NEXTHDR_NONE && ipv6_ext_hdr(protocol)) {
+			struct ipv6_opt_hdr *hp;
+
 			/* only supported extension headers */
 			if (protocol != NEXTHDR_ROUTING &&
 			    protocol != NEXTHDR_HOP &&
-			    protocol != NEXTHDR_DEST &&
-			    protocol != NEXTHDR_FRAGMENT) {
+			    protocol != NEXTHDR_DEST) {
 				skb_checksum_help(skb);
 				return;
 			}
 
-			if (protocol == NEXTHDR_FRAGMENT) {
-				struct frag_hdr *hp =
-					OPT_HDR(struct frag_hdr, skb, off);
-
-				protocol = hp->nexthdr;
-				off += sizeof(struct frag_hdr);
-			} else {
-				struct ipv6_opt_hdr *hp =
-					OPT_HDR(struct ipv6_opt_hdr, skb, off);
-
-				protocol = hp->nexthdr;
-				off += ipv6_optlen(hp);
-			}
+			hp = OPT_HDR(struct ipv6_opt_hdr, skb, off);
+			protocol = hp->nexthdr;
+			off += ipv6_optlen(hp);
 		}
 		/* if we get here - protocol now should be TCP/UDP */
 #endif

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/iwlwifi-pcie-fix-access-to-scratch-buffer.patch queue-4.7/iwlwifi-mvm-checksum-ipv6-fragmented-packet.patch queue-4.7/iwlwifi-mvm-free-rx-reorder-buffer-on-restart.patch