From nobody Thu Feb 6 18:32:37 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 4Ypm1K2zGdz5mrlS; Thu, 06 Feb 2025 18:32:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ypm1K2Sjwz3plZ; Thu, 06 Feb 2025 18:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738866757; 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=YeIM3B6T0Vk5/buRLKqQgo/3pzIW2E4zo0u4sIat4L4=; b=hOPOybZvhuOfP6MFXu6uhEgxV0L4Hbo99BseDfQ+BuuuMvl+AQM2tRy0LGrWQLlfD4eiZG Y9M4RtYy+pM153Wa6MbqJxokUW4Ld7DoY16y1VMenxk47ufwVTr9Z0bB5LCDPfF8n6LVBV IuvOaH9p3d/5Jb/8Uv4Nx6wHPsduTNEuESDRTdjnLXdG2qQYh5TRgMa/7Mzdp4FJyzBuP1 9qHj+ZiyGFfgt2x5E1MIbjUTpRJ2qVolkw12POV3ut9gmhxNkQTIJugEMEHCyrTLoyIq4c Bh/IRxQFdjpEMcV3uxbBNFwqKQ02qUmnEfd8bYSZ3imedt/1n61SltZVSqCRsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738866757; 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=YeIM3B6T0Vk5/buRLKqQgo/3pzIW2E4zo0u4sIat4L4=; b=r1wQP/QhcAZaMqkWARfYja6sFY4BsmiXjbXo0oghvgsjiByT9Rm3i/upixRrAMsF9mjtUE 7SnRdHhY2v3aL7NMHT6qB0Egripn8QLRFQNEKwHcTG2tdU+QnRtXmXO83GfcyQChd4c6GL gdy44yKnxc1PCl5a9kvIs3pNqKZX5HpRsDadW/xawJLmXtBoC6utKbTz+YTMZ4EZhSii8R pacrpzOHfyRHJx69F7uH1ItTnrePponHncEGIF9HPKTJ5p0E4bSamfYtuBXS9l+A3ZHhoW zm5BpJESRwJMLamqQZvgxvGDeOdyxI/BxbbvXNHTtg5hv5Rg/BMwY8EtwQxT3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738866757; a=rsa-sha256; cv=none; b=R6Zq93I94NyJa6bbqA48qT782D6oEJkHR6ZYGQo/tW8G+XFC+CHUhIUbWnNQ654JcKyhf+ 54R2GXHz+kii29wDXG6uy8tVMNUtcrnoZrM4MxK+9MSt7bWDqkPGifmupTEY8I9ERxRggi MhCeSKd7lVJevWlr+10pDwkkyuCCnQS0pWR+VO7i3jhweZwPKy4Y0K2MaoEsTJdpkfmZcI JtNkrrcKx6ca7yF/g9kSo1zFJNzWOYbLjFAgX5N5VDNw16ybOHgKrx87MScrPAH1kdKi9Q 6IRpL0Lt9sBx/RYc0H2HZlRlih8vE9YVOH7SjIF90vcY6XDvG8folVCQXhhBcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ypm1K1sY0zqKN; Thu, 06 Feb 2025 18:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516IWb2Z038187; Thu, 6 Feb 2025 18:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516IWbBr038184; Thu, 6 Feb 2025 18:32:37 GMT (envelope-from git) Date: Thu, 6 Feb 2025 18:32:37 GMT Message-Id: <202502061832.516IWbBr038184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: d8413a1c3ba2 - main - ifnet: Fix build without BPF 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8413a1c3ba235a79ae6b8cc35767a861855c7e2 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=d8413a1c3ba235a79ae6b8cc35767a861855c7e2 commit d8413a1c3ba235a79ae6b8cc35767a861855c7e2 Author: Zhenlei Huang AuthorDate: 2025-02-06 18:32:05 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-06 18:32:05 +0000 ifnet: Fix build without BPF The newly introduced function bpf_ifdetach() is only available when device bpf is enabled. Fixes: 1ed9b381d470 ifnet: Detach BPF descriptors on interface vmove event --- sys/net/if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index 283da94e7601..ce0c3d5c0616 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1262,10 +1262,12 @@ finish_vnet_shutdown: static void if_vmove(struct ifnet *ifp, struct vnet *new_vnet) { +#ifdef DEV_BPF /* * Detach BPF file descriptors from its interface. */ bpf_ifdetach(ifp); +#endif /* * Detach from current vnet, but preserve LLADDR info, do not