From nobody Mon Aug 4 13:44:12 2025 X-Original-To: dev-commits-src-all@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 4bwd7x1Kv8z644DN; Mon, 04 Aug 2025 13:44:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwd7w6f6Qz3YvF; Mon, 04 Aug 2025 13:44:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754315053; 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=T4hLtq8bEXfNM6ho6shxfTP7FQwjMEFTxumWJWN9a6U=; b=GxcruH1RNXRLBVsb+Tqn3mzthVst4sg7W3frRpjv5hSpo2BqORosg/lZCDQRuJXzATQ1rO rukSMujJRKaYfNcx19o7qoq5FdsP0Ifm4OQnUYJiXo+sEHQru8SPy91iygh6UfXM1UToL9 +dFBocWEFffUZJBwzfcJJVjLu0jrFRh9F1N3NTfZiA7iyK2RYbEurqiUlULglTZBdBe/st odbJJNj2crunvoP8LNbGvN5qzrR8V0SnFMm7oPEbQDuJ0nshPb3A6w6llSEAlvHR+zYA4L skF33j2wr4/DUNbRdRK2TVidDpSwnhLOi/mcxMCu3z+rxh86Ry1I3FDXggKyaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754315053; 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=T4hLtq8bEXfNM6ho6shxfTP7FQwjMEFTxumWJWN9a6U=; b=vSwbuefbtsEgQIEAaGaqMkLRdI0Z/7Bh4c2ybiM8hWZQ6wgTqdYwOiB1bdOi5wuA8dPkca 2CbOetm/JoLUsoPhydFxuQ/jLY8Fcs4dMXXJhnVW3+zq6Pc+dsYrCgTUPoC0DPLakMcAcZ d3KJugcERhc9DZZfN8efIpcZzoVuRrcBvDwHxrV4ZZBoF/egE7xSdQj+emxNY+gydghu31 TaQ/3WAh4pOTcK8dHpzEm4r1esNjIGefQHhD3l8XWYdUQ7IMiLVehdRhV5ZF2CLthj+LQt fHUxY4OrsdbciGSsi4GaB+JTVKuo8NTUSB+P9B/Jq4jv+iALcjUh23hV5dIULg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754315053; a=rsa-sha256; cv=none; b=tKq2dZHIcw2mHPn8kr/Ne0L751zusQPYjwocvGdx+Ky8NFaaPdTnmhesY0rBnsKatwTrvR d6Rcn0u8hKGCfWjrvrQ8qIg5Lndm+W4gXlbNtIYwPj5zpzYaCLpGqI2yTGxX34MmYQox1k GHiRKsCZI8BMwW1P+MBP6bpBVE0V+asx447wIUKzlJ5P5NRlw06xFPyeupLUKq7GJA1h98 L6Q+iePeIDGSi2pX3rt1QXFTJ7nFqK64puyxV/HRV9L4towbMo9gnCW5xHf5uP5pjlFUrb zZUdfLrVmSI3yHy5zgll41A4TQtv2NTeV1d5CgJw6iEo7GB4am1OahptPhjj4w== Received: from [IPV6:2601:5c0:4202:5670:3cb2:220f:177b:6972] (unknown [IPv6:2601:5c0:4202:5670:3cb2:220f:177b:6972]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bwd7w4Ysqz9Yb; Mon, 04 Aug 2025 13:44:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7225f395-cf53-4692-863f-8fe1adf8e149@FreeBSD.org> Date: Mon, 4 Aug 2025 09:44:12 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 96a550e9dd89 - main - genet: Add a detach routine Content-Language: en-US To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202508012009.571K9FBP097692@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/1/25 21:00, Zhenlei Huang wrote: > > >> On Aug 2, 2025, at 4:09 AM, John Baldwin wrote: >> >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=96a550e9dd892f24a479da00ead93fbfaafb7733 >> >> commit 96a550e9dd892f24a479da00ead93fbfaafb7733 >> Author: John Baldwin >> AuthorDate: 2025-08-01 20:07:30 +0000 >> Commit: John Baldwin >> CommitDate: 2025-08-01 20:07:30 +0000 >> >> genet: Add a detach routine >> >> PR: 288309 >> Co-authored by: Mike Belanger >> MFC after: 2 weeks >> --- >> sys/arm64/broadcom/genet/if_genet.c | 35 +++++++++++++++++++++++++++++++++++ >> 1 file changed, 35 insertions(+) >> >> diff --git a/sys/arm64/broadcom/genet/if_genet.c b/sys/arm64/broadcom/genet/if_genet.c >> index 182b5582fb7c..013573f1551b 100644 >> --- a/sys/arm64/broadcom/genet/if_genet.c >> +++ b/sys/arm64/broadcom/genet/if_genet.c >> @@ -201,6 +201,7 @@ struct gen_softc { >> >> static void gen_init(void *softc); >> static void gen_start(if_t ifp); >> +static void gen_stop(struct gen_softc *sc); >> static void gen_destroy(struct gen_softc *sc); >> static int gen_encap(struct gen_softc *sc, struct mbuf **mp); >> static int gen_parse_tx(struct mbuf *m, int csum_flags); >> @@ -379,6 +380,39 @@ gen_destroy(struct gen_softc *sc) >> } >> } >> >> +static int >> +gen_detach(device_t dev) >> +{ >> + struct gen_softc *sc; >> + int error; >> + >> + sc = device_get_softc(dev); >> + > > ~~~~~~ >> + GEN_LOCK(sc); >> + gen_stop(sc); >> + GEN_UNLOCK(sc); >> + callout_drain(&sc->stat_ch); >> + ether_ifdetach(sc->ifp); > ~~~~~~ > > I guess the above logic want be wrapped by condition `device_is_attached(dev)` . That is always true for a detach routine, so there is no need to test it. -- John Baldwin