From owner-dev-commits-src-all@freebsd.org Mon Feb 1 14:27:23 2021 Return-Path: Delivered-To: dev-commits-src-all@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 6297652BB56; Mon, 1 Feb 2021 14:27:23 +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 4DTqyz2MSWz3jvL; Mon, 1 Feb 2021 14:27:23 +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 43FE81CB3B; Mon, 1 Feb 2021 14:27:23 +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 111ERNqF031255; Mon, 1 Feb 2021 14:27:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111ERNL7031254; Mon, 1 Feb 2021 14:27:23 GMT (envelope-from git) Date: Mon, 1 Feb 2021 14:27:23 GMT Message-Id: <202102011427.111ERNL7031254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 88be0e11205e - main - bridge: fix STP roles and protos strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88be0e11205e4a2dc77e29f7b4a2e82b8d7c9a5c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2021 14:27:23 -0000 The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=88be0e11205e4a2dc77e29f7b4a2e82b8d7c9a5c commit 88be0e11205e4a2dc77e29f7b4a2e82b8d7c9a5c Author: Jonah Caplan AuthorDate: 2021-01-30 13:54:09 +0000 Commit: Kristof Provost CommitDate: 2021-02-01 14:27:06 +0000 bridge: fix STP roles and protos strings Add the missing commas that got lost in e5539fb618cc7. PR: 252532 Reviewd by: kp@, donner@, freqlabs@ MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D28425 --- sys/net/if_bridgevar.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index fef252821be7..c12ee4598548 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -278,15 +278,15 @@ struct ifbpstpconf { "discarding" #define STP_PROTOS \ - "stp" \ - "-" \ + "stp", \ + "-", \ "rstp" #define STP_ROLES \ - "disabled" \ - "root" \ - "designated" \ - "alternate" \ + "disabled", \ + "root", \ + "designated", \ + "alternate", \ "backup" #define PV2ID(pv, epri, eaddr) do { \