From nobody Tue Mar 7 14:46:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWJDz3SR4z3wF6v; Tue, 7 Mar 2023 14:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWJDz0hVGz44KL; Tue, 7 Mar 2023 14:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678200419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/8462+pFbWgsBpat22xIs9KN7u/swSCuwgosQMMQ8g=; b=pgIrj+tkM4CNHRGE6oyR4BaT967PdNQx7NNhSoyGKiN4yjKdvr39ZhRKsblMPdyJce0Dp8 0mafce7qqSFXhztgkQyIBWqn2TVfEpt5t0O05dgG2Nk7yFG+MNJd03XVOLm/v0jBoJntd6 HkKq4Dw5yEYgSigg8MWktKxzDVnEiJ4SVjS/x1fW3ZhhgUXX09Ts8ZyYYADDTyDtEfOtfi vbaDF0hx2PLMRHzpBQoolD6kGoJe/CNS6uPEBMkUdsJF9DFcHhkiUti/B8JgkB5lVqNbIb MxPUFsBjleeZXJWJT9t6WIc0nlcSXpsIQrsIaXqZNqXU71q50XWVgGByX2Tz3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678200419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T/8462+pFbWgsBpat22xIs9KN7u/swSCuwgosQMMQ8g=; b=CP0ZbldKnQSzHIhhnP/UCOhBIjBdi4ZiQM3dwIaHUTva65NWsAZnZJj7IWuDnMrr/QoZR9 6A96JHZesP5V4IAO3TutJPMc9CqVNrq0/26/254PwmqcLT9YxXwBOSzFMbi5TSc8b6hj0C L8l1RqkokKMgqikHH/HfvoQeK/Z5K47k3l1sOtS6KdrPF3/rdmYdW9EuKzaqOWn5TolDg6 WqQwB3kQt9fV8j/9+Zn5LZn9l0s4UZ8j43lO5CHEHWkWyPc8473JGn3K28Sm3Baz1WJWHg 6tnTZi/go5ptOueVCqWZxQ/hSiS0+8J6KRJxBbD4sXPA0Wpcefrmcjn8s64JoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678200419; a=rsa-sha256; cv=none; b=AGCGPtN031jZX4xQdqtwQG46eCVPckMeIBPwq1Nkn3AShcDk+LfFL0JXAfI68w2PrBBy9S QvhvcsKpiIzduWAkWIV2/PzaxPt0XvuNc6QIdpQiaaB+5M8MhG5eNnwDQXx3PU1MQIl7rt s22rd2Lbh5a9dKUXsJwbT8ld2UdxSI5rFLVELCSlcVUuBH4WJ+MXG10MzIE2A7sPSuCKve mcFYRtkl+33uwwVRwZDhLRRGkFzZ10cL2N5i5lHJ+XwTtCpEcI0JaMlL1rM9hlS4RNzLum 5NM8MyISsfF4RjK6X+uc1YGrOBRhU9WwL710uG4/gQcozRMPNLEES+BzMM0Bxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PWJDy6vbnznFp; Tue, 7 Mar 2023 14:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327EkwIM008853; Tue, 7 Mar 2023 14:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327Ekw6m008852; Tue, 7 Mar 2023 14:46:58 GMT (envelope-from git) Date: Tue, 7 Mar 2023 14:46:58 GMT Message-Id: <202303071446.327Ekw6m008852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 068f2c0e10d5 - main - Mechanically convert dwc(4) to IfAPI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 068f2c0e10d59919b6a5fb0703742a6560289b30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=068f2c0e10d59919b6a5fb0703742a6560289b30 commit 068f2c0e10d59919b6a5fb0703742a6560289b30 Author: Justin Hibbits AuthorDate: 2022-08-20 02:04:32 +0000 Commit: Justin Hibbits CommitDate: 2023-03-07 14:49:11 +0000 Mechanically convert dwc(4) to IfAPI Reviewed by: manu (older) Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D37846 --- sys/arm/allwinner/aw_if_dwc.c | 3 +++ sys/dev/dwc/if_dwc.c | 2 +- sys/dev/dwc/if_dwcvar.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/aw_if_dwc.c b/sys/arm/allwinner/aw_if_dwc.c index 067afbdbd9c4..c448e9ecf51d 100644 --- a/sys/arm/allwinner/aw_if_dwc.c +++ b/sys/arm/allwinner/aw_if_dwc.c @@ -31,8 +31,11 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include + #include #include diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index 5fc735fdd5f1..9165a860bf78 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -475,7 +475,7 @@ dwc_setup_rxfilter(struct dwc_softc *sc) /* * Set the primary address. */ - eaddr = IF_LLADDR(ifp); + eaddr = if_getlladdr(ifp); lo = eaddr[0] | (eaddr[1] << 8) | (eaddr[2] << 16) | (eaddr[3] << 24); hi = eaddr[4] | (eaddr[5] << 8); diff --git a/sys/dev/dwc/if_dwcvar.h b/sys/dev/dwc/if_dwcvar.h index 97ae0ea681c8..f4193b8222c9 100644 --- a/sys/dev/dwc/if_dwcvar.h +++ b/sys/dev/dwc/if_dwcvar.h @@ -65,7 +65,7 @@ struct dwc_softc { int mii_clk; device_t miibus; struct mii_data * mii_softc; - struct ifnet *ifp; + if_t ifp; int if_flags; struct mtx mtx; void * intr_cookie;