From nobody Thu Sep 7 20:28:51 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 4RhW6X14kGz4sslf; Thu, 7 Sep 2023 20:28:52 +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 4RhW6W70mtz4ZyW; Thu, 7 Sep 2023 20:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118532; 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=M9vSlC8jPnYzT45+4XTVmuyXcG9yB8Uwzj/xmmMKfxc=; b=UBzqI0HW/LWbzd3bTneOQxCW457BbQV+cRLQYEhQNdFoQZts23CDZetNoFYzXn/Zdmh2/v BaNlMLqRRp+X/Kos73hTVaZP/GFm9eZ1VYVp/EVPljyPWjwbE5qnpF0Aq/vGverOfszL2t S+rUI/G9GG7iCN6nHlTP4dMi4PueW/ZOtCtcXBiUBoP50fChEFDe3TLqHLksOougqXuaED 2Z1SQBzGSNqEi6x9VXDAcefho6mc8FJsFNMfWw17hJ03WQK7Plkzjsdq6yuzDxkO1ftpb0 TA8gRLK3vcUAGYFxkU/+JCFkJwTm0hNKL8qAjv6XkcjPGf+oHM6dX0LpKIKdvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118532; a=rsa-sha256; cv=none; b=B/MJxk/6rUiK1Xk1fed1FdlFcFTFOXbIpr6OY2tEqapQzkNZUscgV1lqS6zpbC+Ea1Gq32 LaKwhpBqk8u44M4SS4YriH2Ip8U1MAkTVGvCMQ2dLhwCifh5UntHgl/sPtYy1O2K6r2KLn OJLEfSkS5ZXHgg0EsW24+VPbcJBDlPIpHkibsODi1QfvVfgi/Xc+0hfuxSBzPA6OF7VTXI EJ4ftB6H0r5XK2FaFMI/U9haMVrbSLFhqu34K4OC6qyxx9zX6GZux2PGEoaLtj/peK1LRD E7Id7Tw9iF8b51DOmXmr3R0LerLvJ0BMtNxBwYwuVRUf1aSDC/+Z3Ac+XTTA0Q== 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=1694118532; 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=M9vSlC8jPnYzT45+4XTVmuyXcG9yB8Uwzj/xmmMKfxc=; b=SRMQWbnKS3f9/u7OdSJ2TotX6qLnbQ4FqW2P33mAVkttA1v9ofT3vetjuRpyE/mSJgdRYS 17SFT4xkWgIBvfZXAs3HRYRgZP4rJ/a91tmyaTHyFcOmDfCb6evWCBYYi1T26n4Yz29uXf UyOoOMjGLjFIpJ5AiNlZ7uf3vh2ojEc+NFz5ACQ6bAYNl2j98tza3LZXoc+FY8I6LaTSt5 j38dAKQVm6OVcLafTW4GIxdwvR2QmjKtG3FwWBrw5olXri4EJm+ic1YpsJuiCL680WdXSy geVaJPFexmfoMOWatDKMtMYVQAlWNnk/3iLPw+x/prhmnvkG65tzLq1KFOcrIQ== 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 4RhW6W5xKHz1CcY; Thu, 7 Sep 2023 20:28:51 +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 387KSpPZ064834; Thu, 7 Sep 2023 20:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSpo2064831; Thu, 7 Sep 2023 20:28:51 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:51 GMT Message-Id: <202309072028.387KSpo2064831@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: a0fea1dc59d5 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 commit a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +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) Approved by: re (gjb) --- 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);