From owner-dev-commits-src-branches@freebsd.org Mon May 10 00:59:14 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 4BA7664723E; Mon, 10 May 2021 00:59:14 +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 4FdjPG1bpsz4YXx; Mon, 10 May 2021 00:59:14 +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 1ED311B8F8; Mon, 10 May 2021 00:59:14 +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 14A0xDdX001937; Mon, 10 May 2021 00:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14A0xDde001936; Mon, 10 May 2021 00:59:13 GMT (envelope-from git) Date: Mon, 10 May 2021 00:59:13 GMT Message-Id: <202105100059.14A0xDde001936@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e0c2f8156cc6 - stable/13 - ifconfig: Minor documentation fix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0c2f8156cc6868f83ab2e4c44f92393b5fb0c0a 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: Mon, 10 May 2021 00:59:14 -0000 The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c2f8156cc6868f83ab2e4c44f92393b5fb0c0a commit e0c2f8156cc6868f83ab2e4c44f92393b5fb0c0a Author: Jose Luis Duran AuthorDate: 2021-04-29 11:03:48 +0000 Commit: Konstantin Belousov CommitDate: 2021-05-10 00:48:05 +0000 ifconfig: Minor documentation fix PR: 255557 (cherry picked from commit 0ea8a7f36db31bfc550bbe5e39703fdedd12fa8c) --- sbin/ifconfig/ifconfig.8 | 6 +++--- sys/net/ethernet.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index b8adad3c75b0..f183bc3dd66f 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD$ .\" -.Dd January 28, 2021 +.Dd April 29, 2021 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2729,9 +2729,9 @@ Values in order of priority are: .Cm 3 .Pq Dv Critical applications , .Cm 4 -.Pq Dv Video, < 100ms latency , +.Pq Dv Video, < 100ms latency and jitter , .Cm 5 -.Pq Dv Video, < 10ms latency , +.Pq Dv Voice, < 10ms latency and jitter , .Cm 6 .Pq Dv Internetwork control , .Cm 7 diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index f174ca9eb143..9a80a6db794f 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -416,8 +416,8 @@ struct ether_vlan_header { #define IEEE8021Q_PCP_BE 0 /* Best effort (default) */ #define IEEE8021Q_PCP_EE 2 /* Excellent effort */ #define IEEE8021Q_PCP_CA 3 /* Critical applications */ -#define IEEE8021Q_PCP_VI 4 /* Video, < 100ms latency */ -#define IEEE8021Q_PCP_VO 5 /* Video, < 10ms latency */ +#define IEEE8021Q_PCP_VI 4 /* Video, < 100ms latency and jitter */ +#define IEEE8021Q_PCP_VO 5 /* Voice, < 10ms latency and jitter */ #define IEEE8021Q_PCP_IC 6 /* Internetwork control */ #define IEEE8021Q_PCP_NC 7 /* Network control (highest) */