From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 98875A0545 for ; Mon, 20 Jun 2022 11:48:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93687427E9; Mon, 20 Jun 2022 11:48:19 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AA36140F19 for ; Mon, 20 Jun 2022 11:48:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655718497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R79fgbpZ8z3Km+h+K5uODmdu0Xu0b/vQzLLe3q+0gRk=; b=Ab+kgf9hGhZ68jGbhybc3FtzpMpWglcJjESO74Ng1FWeGnm/yyO4KOknPY8x04r3O/bjTx IaPgTbONV5EXxwmSXEkPi87RJVke4zLAeabf9BVbu0oVQAPB7mGN86VOyOKZMRmKT17mjg MYCk/Vty5tY94O0NRnnrdNR+Cycnmc0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-23oXKTcaNVCFyG4lnl3WHw-1; Mon, 20 Jun 2022 05:48:12 -0400 X-MC-Unique: 23oXKTcaNVCFyG4lnl3WHw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3A463C02B6F; Mon, 20 Jun 2022 09:48:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80787404E4DE; Mon, 20 Jun 2022 09:48:10 +0000 (UTC) From: Kevin Traynor To: Ke Zhang Cc: Andrew Rybchenko , Ferruh Yigit , dpdk stable 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 Message-Id: <20220620094752.1027299-10-ktraynor@redhat.com> In-Reply-To: <20220620094752.1027299-1-ktraynor@redhat.com> References: <20220620094752.1027299-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Signed-off-by: Andrew Rybchenko Acked-by: Ferruh Yigit --- 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,