From nobody Mon Sep 4 23:37:57 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 4RflS55f4tz4rSR3; Mon, 4 Sep 2023 23:37:57 +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 4RflS558KGz4H1R; Mon, 4 Sep 2023 23:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870677; 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=2e5lAMB9OAzC/NpYm7s20M/SZgOQkzB78BbMFbg6V/g=; b=MN+ASbnXfIlpku0LgqG9X3CT6hLGqo2/uluxEX+u0pGdTgoHql6jtANgO80x2MCUM65bps DwzFLGgHPXlGPcnGh3SYNIrJaRqvTc2OC52Tn5ttjHZHQfI0tP+iUvqqhNGWRnZxbOzAkC Tfl03/jOIb3dG4KxdbB321LDOwDlRHqCWAtd+3y7S6i3tL7di2mWT6y152U3hrGblGnmd+ i4C35pKoFyjuvmh9Pb1ol+TQRWag5g0cOPcKtnouHM8b8F6PVDTJ0Pc5DqE4eViXIlGGHe 98zDNLhy4j3hONiQBH+f2tm7SxjMq01KNPhjfhB7MB4AcOgmZyWcCRjWtQ8cuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693870677; a=rsa-sha256; cv=none; b=Ht60+8Tnowali2tp5Y/Gt7OdNTRQeK54phSfrg4fR+a80UQjYlUJJ3YgqdmfaxHuRQYLlc w/7YasyyUGcA/J4ix02STjOfSfXUq0mfzp2jnu1q0JzFGWP/U5u2AApae9pzLhiRfo8eDJ PAqfKe9UwvU2ra+kxxkSwL6emR+6VFer4TbNmFx7zxYAZVAN/Qu8s3QnPgunFouWWDOinl +/Imy98FjA8nnoZ5jTllastnMNhsJGJrBBP8Oj1hQEL1SX6sQmzUudBLlRG1AfUvgDIRsn qPmc3ODGrzMKYt3gt6lIs3gFiqAzESOOxY9txfEC7IkW+LVJWLMBvkzS398gZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870677; 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=2e5lAMB9OAzC/NpYm7s20M/SZgOQkzB78BbMFbg6V/g=; b=ZFznKCniWq81WfuZFDqi6fEDKXcnuxk6vEvqH6fWH0O+diKTINgM+GB27irUf4L98XLZNP gpnBQL+6HF2352SfojbBcMEIesmu/BOLgd6ixZuFEeVwQhxyylnQvCuFlVLCwyZ0p8bS04 13GvSV1+ZAx8hAXUbgn8NDYl2o8UWU55sxJCST/ltaIZnmk7juBpZO0HPUmb0ufUWmPMwu +YoWLkRL8XLln/O7b8bqB+xkN1ZlbOsgE6mVrgegDiMIBS18mFTFOXziH4yED84jAj+ac4 AOG22now7UYHJBNCE/JrzQV4ct/zkULyc0352kBxafQRm/7KBnJh7VkbshkbnQ== 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 4RflS54FcVz1Q4H; Mon, 4 Sep 2023 23:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384Nbvl8001513; Mon, 4 Sep 2023 23:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384NbvnE001510; Mon, 4 Sep 2023 23:37:57 GMT (envelope-from git) Date: Mon, 4 Sep 2023 23:37:57 GMT Message-Id: <202309042337.384NbvnE001510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b451dcc84f1c - main - if_vlan: Always default to 802.1q. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-04 23:26:18 +0000 if_vlan: Always default to 802.1q. There is no reason for this fallback to be conditional on COMPAT_FREEBSD12. PR: 273539 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: melifaro, allanjude Differential Revision: https://reviews.freebsd.org/D41717 --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 41a099c1407a..e7a290564722 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1106,11 +1106,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, return error; vid = vlr.vlr_tag; proto = vlr.vlr_proto; - -#ifdef COMPAT_FREEBSD12 if (proto == 0) proto = ETHERTYPE_VLAN; -#endif p = ifunit_ref(vlr.vlr_parent); if (p == NULL) return (ENXIO); @@ -2262,10 +2259,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } -#ifdef COMPAT_FREEBSD12 if (vlr.vlr_proto == 0) vlr.vlr_proto = ETHERTYPE_VLAN; -#endif oldmtu = ifp->if_mtu; error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto); if_rele(p);