From owner-dev-commits-src-branches@freebsd.org Sun May 23 03:03:33 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7A0D363E141; Sun, 23 May 2021 03:03:33 +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 4FnlXj2rNlz4fb1; Sun, 23 May 2021 03:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4A77F7FDB; Sun, 23 May 2021 03:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14N33XQ8099661; Sun, 23 May 2021 03:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14N33X9f099660; Sun, 23 May 2021 03:03:33 GMT (envelope-from git) Date: Sun, 23 May 2021 03:03:33 GMT Message-Id: <202105230303.14N33X9f099660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: d6112f7dd874 - stable/12 - if_vlan.c: really fix it. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d6112f7dd8742a2a17292557352c12dff1aa24a9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 May 2021 03:03:33 -0000 The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=d6112f7dd8742a2a17292557352c12dff1aa24a9 commit d6112f7dd8742a2a17292557352c12dff1aa24a9 Author: Eugene Grosbein AuthorDate: 2021-05-23 03:01:56 +0000 Commit: Eugene Grosbein CommitDate: 2021-05-23 03:01:56 +0000 if_vlan.c: really fix it. Sigh... Another direct commit to stable/12 to fix build. --- sys/net/if_vlan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 1830c1cc441a..2f1b1dec9603 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1185,7 +1185,6 @@ static int vlan_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro) { - struct epoch_tracker et; struct ifvlan *ifv; struct ifnet *p;