From nobody Wed Jun 25 15:30:14 2025 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 4bS5Nk6Dvjz609TP; Wed, 25 Jun 2025 15:30:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS5Nk5Shxz3xYq; Wed, 25 Jun 2025 15:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865414; 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=bXqAZ0gjc4rh98o27VjPsW3WH5Id/6JlZMOCdhSlUQ4=; b=Dj5GX8PeofYJ2EbRktk5UxxCBh+fuw8YwCbrAhvicxsnOj0XQLs48KZy+bDBRn1Pg8YzwQ Ix5+yv+4EzTisybwjbtChs8V+BP89lnje9l3D5G9VKD65bT8xc5+qoomyBnyImOjJzPmxt DzGxwZyHMdtCVVfMVSjiwHNAqRCh2mwPHzkLIy7JaG+rPzd9VteaF9YyQuc/YNJRe8z9He dG/vG5aaWXf6AUyi/zbGNmIWah4vHCtRnMnwPv6LqSmv7XuRUlmzDVBsXJpkAhObeocdxs q6Pip67s8fKCaq1jLQpWNFRMlJR1RgfRG6ExbryBxZGo0qEU2vxaI+J9qCZd5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750865414; 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=bXqAZ0gjc4rh98o27VjPsW3WH5Id/6JlZMOCdhSlUQ4=; b=THT2phwlXrbrsEq7kW5g7//CkAHhK9CcLtFCmwPBkSSEk4qp+icFpf+/BEM4gWkNA2FN4n cGbVj2roAa9L3IZCUKXkBR4Hyyedw2lOqWntUqUqJAw+E+591OYrsFdF7F3pENmDM7Zd9L sgBhFzFsKt6kqyMBnJiuWfKkqh+m1kCzANA3fZHLcBgIMqTUcF7IFUDQKwQas5Pi9djCDX vc5p+4KfvypXeKtWhR1HF1cnjEDpHDkE/NNIj4mjn3UzOMfdeV72B9iaLj5mPTTzhwlIik kIaJ90QvLyuTDfSw1MfUAd3uiFEHS17V6+DlKeQUmlEwzEIwBoRoVDdpL1Uh0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750865414; a=rsa-sha256; cv=none; b=uQxNfM7frRtjHHc7DUKtzvaXVU59ELQf8QJzM0rZ9+hbAmpXrGkPoNc2EBAvBR/3yAWuGa byLEpgamxFVvkUNvDxyvexcSTuGtPmctW09UHt0M0y6Jq1AA5bxP/g4YJq/bu1uwYR9aNK zctJ9lCPiuRR8W3Kb/2hMcDAjMPFqvI9lAExRkBU+VwGz3+fqKXeCEAJLnm40Kv8hByp9m tatMaGCb85CHbYUh2mCOe+znrJFaSUGhr95o+ijAsSRpRBP8rwteM05zP/WcYxu14bwpv+ yPa8apZyVsfqrve5l5TkBLQuWGSKc/gz5J1IX2GM3qA9RPGde9eGdYxFjkkrVw== 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 4bS5Nk4XL3z7fW; Wed, 25 Jun 2025 15:30:14 +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 55PFUEIb060828; Wed, 25 Jun 2025 15:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PFUEkH060815; Wed, 25 Jun 2025 15:30:14 GMT (envelope-from git) Date: Wed, 25 Jun 2025 15:30:14 GMT Message-Id: <202506251530.55PFUEkH060815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 6a13b3d90612 - main - if_vlan: add a prototype for vlan_input_p 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a13b3d90612120c6e157ce7aaf7e2d1340e98ad Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=6a13b3d90612120c6e157ce7aaf7e2d1340e98ad commit 6a13b3d90612120c6e157ce7aaf7e2d1340e98ad Author: Lexi Winter AuthorDate: 2025-06-25 14:23:34 +0000 Commit: Lexi Winter CommitDate: 2025-06-25 15:29:54 +0000 if_vlan: add a prototype for vlan_input_p Move the definition of vlan_input_p to net/if.c and its prototype to if_vlan_var.h, to match the other functions exported from if_vlan. Remove the previous comment which is now outdated. This is required for if_bridge to use this function. Reviewed by: zlei, kp, des, kib Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50567 --- sys/net/if.c | 1 + sys/net/if_ethersubr.c | 2 -- sys/net/if_vlan.c | 9 --------- sys/net/if_vlan_var.h | 1 + 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index 9048fcb0a16a..79c883fd4a0a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -2089,6 +2089,7 @@ int (*vlan_tag_p)(struct ifnet *, uint16_t *); int (*vlan_pcp_p)(struct ifnet *, uint16_t *); int (*vlan_setcookie_p)(struct ifnet *, void *); void *(*vlan_cookie_p)(struct ifnet *); +void (*vlan_input_p)(struct ifnet *, struct mbuf *); /* * Handle a change in the interface link state. To avoid LORs diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index cec1c08c2614..66a4724a786c 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -106,8 +106,6 @@ int (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp); void (*ng_ether_attach_p)(struct ifnet *ifp); void (*ng_ether_detach_p)(struct ifnet *ifp); -void (*vlan_input_p)(struct ifnet *, struct mbuf *); - /* if_bridge(4) support */ void (*bridge_dn_p)(struct mbuf *, struct ifnet *); bool (*bridge_same_p)(const void *, const void *); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index a37a9d41fc53..9561ae5c316c 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -888,15 +888,6 @@ vlan_devat(struct ifnet *ifp, uint16_t vid) return (ifp); } -/* - * VLAN support can be loaded as a module. The only place in the - * system that's intimately aware of this is ether_input. We hook - * into this code through vlan_input_p which is defined there and - * set here. No one else in the system should be aware of this so - * we use an explicit reference here. - */ -extern void (*vlan_input_p)(struct ifnet *, struct mbuf *); - /* For if_link_state_change() eyes only... */ extern void (*vlan_link_state_p)(struct ifnet *); diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 3a8e45dfab03..f0b09445d04b 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -168,6 +168,7 @@ extern int (*vlan_tag_p)(struct ifnet *, uint16_t *); extern int (*vlan_pcp_p)(struct ifnet *, uint16_t *); extern int (*vlan_setcookie_p)(struct ifnet *, void *); extern void *(*vlan_cookie_p)(struct ifnet *); +extern void (*vlan_input_p)(struct ifnet *, struct mbuf *); #include