[dpdk-stable] patch 'net: explicit cast of protocol in IPv6 checksum' has been queued to LTS release 17.11.5
Yongseok Koh
yskoh at mellanox.com
Thu Jan 3 09:13:51 CET 2019
Hi,
FYI, your patch has been queued to LTS release 17.11.5
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/04/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Yongseok
---
>From cbeceb589abe4faeff3484776e008d466b4edebf Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Thu, 17 May 2018 21:50:17 +0800
Subject: [PATCH] net: explicit cast of protocol in IPv6 checksum
[ upstream commit 8bf255bb3862d8f35496b26bc8c2511239bdc18b ]
GCC 8.1 warned:
In function 'rte_ipv6_phdr_cksum':
rte_ip.h:378:18: warning: conversion to 'uint32_t' {aka 'unsigned int'}
from 'int' may change the sign of the result [-Wsign-conversion]
psd_hdr.proto = (ipv6_hdr->proto << 24);
Fixes: 6006818cfb26 ("net: new checksum functions")
Signed-off-by: Andy Green <andy at warmcat.com>
---
lib/librte_net/rte_ip.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 332ac1414..6a7426049 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -437,7 +437,7 @@ rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)
uint32_t proto; /* L4 protocol - top 3 bytes must be zero */
} psd_hdr;
- psd_hdr.proto = (ipv6_hdr->proto << 24);
+ psd_hdr.proto = (uint32_t)(ipv6_hdr->proto << 24);
if (ol_flags & PKT_TX_TCP_SEG) {
psd_hdr.len = 0;
} else {
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-01-02 23:59:13.569473284 -0800
+++ 0028-net-explicit-cast-of-protocol-in-IPv6-checksum.patch 2019-01-02 23:59:12.088816000 -0800
@@ -1,8 +1,10 @@
-From 8bf255bb3862d8f35496b26bc8c2511239bdc18b Mon Sep 17 00:00:00 2001
+From cbeceb589abe4faeff3484776e008d466b4edebf Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Thu, 17 May 2018 21:50:17 +0800
Subject: [PATCH] net: explicit cast of protocol in IPv6 checksum
+[ upstream commit 8bf255bb3862d8f35496b26bc8c2511239bdc18b ]
+
GCC 8.1 warned:
In function 'rte_ipv6_phdr_cksum':
@@ -11,7 +13,6 @@
psd_hdr.proto = (ipv6_hdr->proto << 24);
Fixes: 6006818cfb26 ("net: new checksum functions")
-Cc: stable at dpdk.org
Signed-off-by: Andy Green <andy at warmcat.com>
---
@@ -19,10 +20,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
-index edbe4335c..c924aca7f 100644
+index 332ac1414..6a7426049 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
-@@ -375,7 +375,7 @@ rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)
+@@ -437,7 +437,7 @@ rte_ipv6_phdr_cksum(const struct ipv6_hdr *ipv6_hdr, uint64_t ol_flags)
uint32_t proto; /* L4 protocol - top 3 bytes must be zero */
} psd_hdr;
More information about the stable
mailing list