From: Kevin Traynor <ktraynor@redhat.com>
To: Ke Zhang <ke1x.zhang@intel.com>
Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Ferruh Yigit <ferruh.yigit@xilinx.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'kni: use dedicated function to set random MAC address' has been queued to stable release 21.11.2
Date: Mon, 20 Jun 2022 10:47:43 +0100 [thread overview]
Message-ID: <20220620094752.1027299-10-ktraynor@redhat.com> (raw)
In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to stable release 21.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 06/23/22. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/9b7982b9867a3c28728f73678ff9cf497dde72f3
Thanks.
Kevin
---
From 9b7982b9867a3c28728f73678ff9cf497dde72f3 Mon Sep 17 00:00:00 2001
From: Ke Zhang <ke1x.zhang@intel.com>
Date: Wed, 8 Jun 2022 15:11:16 +0300
Subject: [PATCH] kni: use dedicated function to set random MAC address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[ upstream commit 2ee8c67ef9399759cb0d3f34b2c9fb6ea0ecc832 ]
eth_hw_addr_random() sets address type correctly.
eth_hw_addr_random() is available since Linux v3.4, so
no compat is required.
Also fix the warning:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type
Variable dev_addr is done const intentionally in Linux v5.17 to
prevent using it directly.
Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Signed-off-by: Ke Zhang <ke1x.zhang@intel.com>
Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
---
kernel/linux/kni/kni_misc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index ad1582d911..38fcd7f4f2 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -408,6 +408,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
else
- /* Generate random MAC address. */
- eth_random_addr(net_dev->dev_addr);
+ /* Assign random MAC address. */
+ eth_hw_addr_random(net_dev);
if (dev_info.mtu)
--
2.34.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-06-20 10:46:28.008186419 +0100
+++ 0010-kni-use-dedicated-function-to-set-random-MAC-address.patch 2022-06-20 10:46:27.786146836 +0100
@@ -1 +1 @@
-From 2ee8c67ef9399759cb0d3f34b2c9fb6ea0ecc832 Mon Sep 17 00:00:00 2001
+From 9b7982b9867a3c28728f73678ff9cf497dde72f3 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 2ee8c67ef9399759cb0d3f34b2c9fb6ea0ecc832 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -32 +33 @@
-index 780187d8bf..4f6dd373a3 100644
+index ad1582d911..38fcd7f4f2 100644
@@ -35 +36 @@
-@@ -406,6 +406,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
+@@ -408,6 +408,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
next prev parent reply other threads:[~2022-06-20 9:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 9:47 patch 'raw/ifpga: remove virtual devices on close' " Kevin Traynor
2022-06-20 9:47 ` patch 'raw/ifpga: unregister interrupt " Kevin Traynor
2022-06-20 9:47 ` patch 'bus/fslmc: fix VFIO setup' " Kevin Traynor
2022-06-20 9:47 ` patch 'doc: fix formatting and link in BPF library guide' " Kevin Traynor
2022-06-20 9:47 ` patch 'dma/idxd: fix error code for PCI device commands' " Kevin Traynor
2022-06-20 9:47 ` patch 'app/testpmd: fix packet segment allocation' " Kevin Traynor
2022-06-20 9:47 ` patch 'app/testpmd: fix multicast address pool leak' " Kevin Traynor
2022-06-20 9:47 ` patch 'net/failsafe: fix device freeing' " Kevin Traynor
2022-06-20 9:47 ` patch 'net/tap: " Kevin Traynor
2022-06-20 9:47 ` Kevin Traynor [this message]
2022-06-20 9:47 ` patch 'kni: use dedicated function to set MAC address' " Kevin Traynor
2022-06-20 9:47 ` patch 'crypto/ipsec_mb: fix build with GCC 12' " Kevin Traynor
2022-06-20 9:47 ` patch 'net/ena: " Kevin Traynor
2022-06-20 9:47 ` patch 'net/enetfec: " Kevin Traynor
2022-06-20 9:47 ` patch 'net/ice: " Kevin Traynor
2022-06-20 9:47 ` patch 'vdpa/ifc: " Kevin Traynor
2022-06-20 9:47 ` patch 'app/flow-perf: " Kevin Traynor
2022-06-20 9:47 ` patch 'dma/skeleton: fix index returned when no memcpy completed' " Kevin Traynor
2022-06-20 9:47 ` patch 'dma/hisilicon: fix includes in header file' " 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=20220620094752.1027299-10-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=ferruh.yigit@xilinx.com \
--cc=ke1x.zhang@intel.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).