From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Nov 2025 13:39:26 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vObHS-005QYd-2G for lore@lore.pengutronix.de; Thu, 27 Nov 2025 13:39:26 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vObHS-0000aS-4G for lore@pengutronix.de; Thu, 27 Nov 2025 13:39:26 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=sCLd17An8NaxMtboDufD6Rp6KrkhzxZFWukayx1XEHk=; b=aPDRqR2iFECow8W46Rn7DIZGlD z2EXXk+h5V7z0RR5HuS+rXUUndQ+PJT61n59245FpRa3X0T+CoWJxU2JdHSGXvR4X5a59mUk62pmm 9lo0fXSKt6/Ap1ZjX9R4pD8vGKfidaox5qohypfTZsuVIoNDVIgYfMY1c7Jvpe1Q8+KTS+FjjLL9K KEQj5VFxpUPrdEYEXG6+r9mq2hJc+WWM0cxNYCoL1vssfBi9BIVBhULdkiE/u+sg+SfN6EAXGgbh7 0AYFeECZY/tKBmmNg1XrdtTAjk5UO8UQx94+FjL23NzklOL06gFPpPWgsWFOsizFvV6CqJzwoGmwb zKH/CPHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vObGp-0000000GZka-0PfH; Thu, 27 Nov 2025 12:38:47 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vObGm-0000000GZjo-1VJU for barebox@lists.infradead.org; Thu, 27 Nov 2025 12:38:45 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vObGk-0000TJ-Jj; Thu, 27 Nov 2025 13:38:42 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vObGk-002n9n-1N; Thu, 27 Nov 2025 13:38:42 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.98.2) (envelope-from ) id 1vObGk-00000009Kun-1J2e; Thu, 27 Nov 2025 13:38:42 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Thu, 27 Nov 2025 13:38:37 +0100 Message-ID: <20251127123841.2225218-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251127_043844_400099_04F4692C X-CRM114-Status: GOOD ( 15.24 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 1/2] net: arp: collect context into new struct pending_arp X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The ARP code employs two global variables to communicate between the code sending off the ARP request and the response that runs in the poller: - arp_wait_ip, which is the IP to be resolved - arp_ether, which on success will point to the resulting MAC address To make the relation between these two clearer and to prepare for the follow-up fix, collect them into a common struct. Signed-off-by: Ahmad Fatoum --- net/net.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/net/net.c b/net/net.c index 4703842f4377..d00d942b514c 100644 --- a/net/net.c +++ b/net/net.c @@ -110,26 +110,33 @@ int setenv_ip(const char *name, IPaddr_t ip) return 0; } -static unsigned char *arp_ether; -static IPaddr_t arp_wait_ip; +/** + * struct pending_arp - Pending ARP state + * @ip: input IPv4 address whose resolution is being requested + * @ether: output MAC addess buffer after receing a response + */ +static struct pending_arp { + IPaddr_t ip; + unsigned char *ether; +} pending_arp; static void arp_handler(struct arprequest *arp) { IPaddr_t tmp; /* are we waiting for a reply */ - if (!arp_wait_ip) + if (!pending_arp.ip) return; tmp = net_read_ip(&arp->ar_data[6]); /* matched waiting packet's address */ - if (tmp == arp_wait_ip) { + if (tmp == pending_arp.ip) { /* save address for later use */ - memcpy(arp_ether, &arp->ar_data[0], 6); + memcpy(pending_arp.ether, &arp->ar_data[0], 6); /* no arp request pending now */ - arp_wait_ip = 0; + pending_arp.ip = 0; } } @@ -162,6 +169,7 @@ static int arp_request(struct eth_device *edev, IPaddr_t dest, unsigned char *et static char *arp_packet; struct ethernet *et; unsigned retries = 0; + IPaddr_t arp_wait_ip; int ret; if (!edev) @@ -207,7 +215,8 @@ static int arp_request(struct eth_device *edev, IPaddr_t dest, unsigned char *et net_write_ip(arp->ar_data + 16, arp_wait_ip); - arp_ether = ether; + pending_arp.ether = ether; + pending_arp.ip = arp_wait_ip; ret = eth_send(edev, arp_packet, ETHER_HDR_SIZE + ARP_HDR_SIZE); if (ret) -- 2.47.3