From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DFB8C433EF for ; Thu, 21 Oct 2021 13:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4413560EE5 for ; Thu, 21 Oct 2021 13:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231446AbhJUNOp (ORCPT ); Thu, 21 Oct 2021 09:14:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:52504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231207AbhJUNOh (ORCPT ); Thu, 21 Oct 2021 09:14:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1636F61221; Thu, 21 Oct 2021 13:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634821941; bh=W2KZ2QY35s2jQBMad09aqLCpblOQ6gUWHmaK1ofF1MA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWpQeZBBc3FVCkSbPW27as7JOgsapK5otnlEEUiwTWzZ32yLhSHz1q9Sf+twL35Cj VYP2e95itx9g3vs2g32BON6Ae0BzWF3Xf7aPh+JvLsOAWUXroWkkLNMp69Ws8ld8Dr 0a5KDYxUB6vZI8xYpUO1lRXf+CVX3Q2XilXi2T1laknzG6Gv5/ZlqvcvU+PDz9LYuc hJcW2aI0Kyqcys4MDrWXkwosueYvvQ8SWdHGHejInx+2ALluJZHh/A88oEfDchUnNf iuGO6Kpss2EfDAp5EfFQhVEDyPiKrxKA8awI6nLO43lMINP631UOjwAyiBkXuzBH9o 4nqh5eJowv1lA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jakub Kicinski , "Maciej W . Rozycki" Subject: [PATCH net-next v2 05/12] fddi: defxx,defza: use dev_addr_set() Date: Thu, 21 Oct 2021 06:12:07 -0700 Message-Id: <20211021131214.2032925-6-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211021131214.2032925-1-kuba@kernel.org> References: <20211021131214.2032925-1-kuba@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it got through appropriate helpers. Acked-by: Maciej W. Rozycki Signed-off-by: Jakub Kicinski --- drivers/net/fddi/defxx.c | 6 +++--- drivers/net/fddi/defza.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 5810e8473789..b584ffe38ad6 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c @@ -1117,7 +1117,7 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name, * dfx_ctl_set_mac_address. */ - memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN); + dev_addr_set(dev, bp->factory_mac_addr); if (dfx_bus_tc) board_name = "DEFTA"; if (dfx_bus_eisa) @@ -1474,7 +1474,7 @@ static int dfx_open(struct net_device *dev) * address. */ - memcpy(dev->dev_addr, bp->factory_mac_addr, FDDI_K_ALEN); + dev_addr_set(dev, bp->factory_mac_addr); /* Clear local unicast/multicast address tables and counts */ @@ -2379,7 +2379,7 @@ static int dfx_ctl_set_mac_address(struct net_device *dev, void *addr) /* Copy unicast address to driver-maintained structs and update count */ - memcpy(dev->dev_addr, p_sockaddr->sa_data, FDDI_K_ALEN); /* update device struct */ + dev_addr_set(dev, p_sockaddr->sa_data); /* update device struct */ memcpy(&bp->uc_table[0], p_sockaddr->sa_data, FDDI_K_ALEN); /* update driver struct */ bp->uc_count = 1; diff --git a/drivers/net/fddi/defza.c b/drivers/net/fddi/defza.c index 0de2c4552f5e..3a6b08eb5e1b 100644 --- a/drivers/net/fddi/defza.c +++ b/drivers/net/fddi/defza.c @@ -1380,7 +1380,7 @@ static int fza_probe(struct device *bdev) goto err_out_irq; fza_reads(&init->hw_addr, &hw_addr, sizeof(hw_addr)); - memcpy(dev->dev_addr, &hw_addr, FDDI_K_ALEN); + dev_addr_set(dev, &hw_addr); fza_reads(&init->rom_rev, &rom_rev, sizeof(rom_rev)); fza_reads(&init->fw_rev, &fw_rev, sizeof(fw_rev)); -- 2.31.1