[dpdk-stable] patch 'kni: fix type for MAC address' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Tue Apr 30 19:01:32 CEST 2019


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 at 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 at jd.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
Reviewed-by: Rami Rosen <ramirose at 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 at 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


More information about the stable mailing list