patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Jie Pan <panjie5@jd.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
	Rami Rosen <ramirose@gmail.com>, dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'kni: fix type for MAC address' has been queued to LTS release 18.11.2
Date: Tue, 30 Apr 2019 18:01:32 +0100	[thread overview]
Message-ID: <20190430170133.2331-37-ktraynor@redhat.com> (raw)
In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 3c3f7838071bcaeb23e655513662bbc0d4a01a49 Mon Sep 17 00:00:00 2001
From: Jie Pan <panjie5@jd.com>
Date: Wed, 10 Apr 2019 14:20:55 +0800
Subject: [PATCH] kni: fix type for MAC address

[ upstream commit c629829f026dd0215db30a34fadfef3830932dd6 ]

The type for MAC address should be unsigned.

Fixes: 1cfe212ed17a ("kni: support MAC address change")

Signed-off-by: Jie Pan <panjie5@jd.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
---
 kernel/linux/kni/kni_misc.c                                   | 2 +-
 lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h | 2 +-
 lib/librte_kni/rte_kni.h                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 522ae23b9..b74e8a3a6 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -448,5 +448,5 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
 	else {
 		/* if user has provided a valid mac address */
-		if (is_valid_ether_addr((unsigned char *)(dev_info.mac_addr)))
+		if (is_valid_ether_addr(dev_info.mac_addr))
 			memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
 		else
diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
index 5afa08713..5db5a1333 100644
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -128,5 +128,5 @@ struct rte_kni_device_info {
 	unsigned mbuf_size;
 	unsigned int mtu;
-	char mac_addr[6];
+	uint8_t mac_addr[6];
 };
 
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 02ca43b4b..d44496c71 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -69,5 +69,5 @@ struct rte_kni_conf {
 	__extension__
 	uint8_t force_bind : 1; /* Flag to bind kernel thread */
-	char mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */
+	uint8_t mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */
 	uint16_t mtu;
 };
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.565658897 +0100
+++ 0037-kni-fix-type-for-MAC-address.patch	2019-04-30 17:58:13.833139247 +0100
@@ -1 +1 @@
-From c629829f026dd0215db30a34fadfef3830932dd6 Mon Sep 17 00:00:00 2001
+From 3c3f7838071bcaeb23e655513662bbc0d4a01a49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c629829f026dd0215db30a34fadfef3830932dd6 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -15,3 +16,3 @@
- kernel/linux/kni/kni_misc.c                       | 2 +-
- lib/librte_eal/linux/eal/include/rte_kni_common.h | 2 +-
- lib/librte_kni/rte_kni.h                          | 2 +-
+ kernel/linux/kni/kni_misc.c                                   | 2 +-
+ lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h | 2 +-
+ lib/librte_kni/rte_kni.h                                      | 2 +-
@@ -21 +22 @@
-index 31845e10f..b6f474de4 100644
+index 522ae23b9..b74e8a3a6 100644
@@ -31 +32 @@
-diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
+diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -33,2 +34,2 @@
---- a/lib/librte_eal/linux/eal/include/rte_kni_common.h
-+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h
+--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
++++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -43 +44 @@
-index 9a9a7d754..c93d3a985 100644
+index 02ca43b4b..d44496c71 100644

  parent reply	other threads:[~2019-04-30 17:02 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-30 17:00 [dpdk-stable] patch 'net/mlx5: fix memory event on secondary process' " Kevin Traynor
2019-04-30 17:00 ` [dpdk-stable] patch 'net/mlx4: change device reference for " Kevin Traynor
2019-04-30 17:00 ` [dpdk-stable] patch 'net/mlx: remove debug messages on datapath' " Kevin Traynor
2019-04-30 17:00 ` [dpdk-stable] patch 'net/mlx5: fix external memory registration' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/sfc: improve TSO header length check in EFX datapath' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/sfc: improve TSO header length check in EF10 " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net: fix Tx VLAN flag for offload emulation' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/testpmd: fix Tx VLAN and QinQ dependency' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/testpmd: fix Tx QinQ set' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'table: fix arm64 hash function selection' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/nfp: fix file descriptor check' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/nfp: fix potential integer overflow' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/nfp: check return value' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/nfp: fix memory leak' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/testpmd: fix mempool free on exit' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/testpmd: fix hex string parser support for flow API' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/testpmd: fix return value check' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/bnxt: fix big endian build' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'net/i40e: fix scattered Rx enabling' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'doc: fix spelling in testpmd guide' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'doc: add flow API to qede NIC features' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'devtools: accept experimental symbol promotion' " Kevin Traynor
2019-05-02  7:25   ` David Marchand
2019-05-02  8:01     ` Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'devtools: skip meson build for missing compilers' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'devtools: support older compilers with meson test' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'examples/l2fwd-cat: fix build on FreeBSD' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'build: use default flags for default Arm machine' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'drivers/event: disable OcteonTx for buggy Arm compilers' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'examples/fips_validation: fix CMAC test' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'doc: add missing algorithms for AESNI-MB PMD' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'crypto/caam_jr: fix shared descriptor endianness' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'crypto/caam_jr: fix total length in auth only s/g' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'crypto/caam_jr: fix memory leak and illegal access' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'doc: fix missing asymmetric crypto table' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'app/crypto-perf: check range of socket id' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'crypto/dpaa: fix session destroy' " Kevin Traynor
2019-04-30 17:01 ` [dpdk-stable] patch 'kni: fix build with Linux 5.1' " Kevin Traynor
2019-04-30 17:01 ` Kevin Traynor [this message]
2019-04-30 17:01 ` [dpdk-stable] patch 'mbuf: update Tx VLAN and QinQ flags documentation' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190430170133.2331-37-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=ferruh.yigit@intel.com \
    --cc=panjie5@jd.com \
    --cc=ramirose@gmail.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).