From nobody Fri Sep 8 10:13:31 2023 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 4RhsQ41Rcnz4sfZ0; Fri, 8 Sep 2023 10:13:32 +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 4RhsQ40dvVz4Q51; Fri, 8 Sep 2023 10:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168012; 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=kFZ7t0Rxh3Wg/9a7L9qTdCrge8ebdDNony98c6l7XXo=; b=vQ/gn5yG9AJvyM07T4e5PQp6vQA4usnDnGOJ+5wSCamy4STonafUqqKnPsoUUZMFsIBRRK +C6o9CusumRn19/rLV7AvkdaOAkre8fdp4rRZUO1qrdO1pkpwQ/ZLxC+DzAVO1J4QbQIWY X7TnfPhf/EhU16HT2P30tnM29CqIATvRKXsKmr5aHQVCUUxwYeIpDinjUr6/mtUZ7Sxv1r E7BdPUmguuJZG3/3erAFFF28D+2zS/PojfhpjTxWhMs84oWeWtIITfcMkDQlySyvtRvJ0k 7j7izL55P/kIhwTOxxX2lm8O3BBfXkLnLmzC5951YSOT2oL0fnWYd4Zrn+ycXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694168012; a=rsa-sha256; cv=none; b=iXtsq7zT0s8yVfY075IJP+Bs/Qmdb31KMQrjseI2Gvi8Jj8anttq1ieXZvWzWl7MKgY6B+ PfZP05A/NO+rpwPZCyICULT+dvSbrmTUSdkHA40o8Oc1hJ5+ZV89P94G1PyaHQpCQ7sKw3 zo9SznkpEq5TmxQSXzzz+R77CPZNwaBCF7H5vAGaz1sdixmnoonV7huNoEYCo25bjICCvc iMyrvLKvIFmLo5Eqkps7Lf11R577HPrfrzvV5f/JhZIA99qOH1KSPyePnpWJ/wyXiKmf9I 2anX5cdvuKqoGNUill130H9Vwq0UzUztfQkglJh+WJXs35l/uRIXomtEWfV+UA== 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=1694168012; 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=kFZ7t0Rxh3Wg/9a7L9qTdCrge8ebdDNony98c6l7XXo=; b=eJasdcSVeplLQSZTlR4aHi9f1Uq+1jLA8KgW3aJ24/+XHYzXuy0/UAo5b/vBmaj2rDsDSN /Xu7FNvMs3UtIib96X3iS0gYSanwQCrZ0SCMHSPijsvQciCtVGps5ze9ElC1U5LnKFHEuY 0fdDwr13OBapicdara0TpHWcfiWBmvsI2dhLl78Jra5P5XkbXZiNB4A0IerpBkCDKnX+wt clZVugb2mLcRtHRTCvFOswtyBctlCh9grmCqUxylfEq+hDkr4d/kHf6ancQLfvNfoi5FM0 4FVwbQEpjG5Ay6tYXengqtdTaxLYMnfvaq2ZOl07496GT69Sl+SfM+XeyM4CnA== 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 4RhsQ36qTfzd5m; Fri, 8 Sep 2023 10:13:31 +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 388ADV7k041256; Fri, 8 Sep 2023 10:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ADVY2041253; Fri, 8 Sep 2023 10:13:31 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:13:31 GMT Message-Id: <202309081013.388ADVY2041253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6d5d8c7b2c74 - stable/13 - if_vlan: Always default to 802.1q. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 commit 6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:09:23 +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 (cherry picked from commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94) --- 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 6c777a855039..9d0e6ae66b31 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1054,11 +1054,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) 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); @@ -2034,10 +2031,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);