50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
|
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
|
|||
|
|
@@ -407,8 +407,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
|
|||
|
|
if (is_valid_ether_addr(dev_info.mac_addr))
|
|||
|
|
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)
|
|||
|
|
net_dev->mtu = dev_info.mtu;
|
|||
|
|
--
|
|||
|
|
2.23.0
|
|||
|
|
|