git: 5856802668ac - stable/12 - pfctl: Add missing 'va' code point name

[Kristof Provost]

The branch stable/12 has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=5856802668ac672efec6ac8bbfa69d34eb2e75a8

commit 5856802668ac672efec6ac8bbfa69d34eb2e75a8
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-03-04 12:50:28 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-03-20 14:48:51 +0000

    pfctl: Add missing 'va' code point name
    
    Add the 'va' (voice-admit, RFC5865) symbolic name.
    
    Reviewed by:    rgrimes, gbe (man page)
    MFC after:      2 weeks
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D29069
    
    (cherry picked from commit b4e3f3c2de6e6dc614f99615e50d0d87f3367ca0)
---
 sbin/pfctl/parse.y       | 3 ++-
 share/man/man5/pf.conf.5 | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 4e7434a8a53e..ed4a09c0d14c 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -6334,7 +6334,8 @@ map_tos(char *s, int *val)
 		{ "lowdelay",		IPTOS_LOWDELAY },
 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
 		{ "reliability",	IPTOS_RELIABILITY },
-		{ "throughput",		IPTOS_THROUGHPUT }
+		{ "throughput",		IPTOS_THROUGHPUT },
+		{ "va",			IPTOS_DSCP_VA }
 	};
 	const struct keywords	*p;
 
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 0faf4c445a61..d8c18252ea91 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -682,6 +682,7 @@ given as one of
 .Ar reliability ,
 or one of the DiffServ Code Points:
 .Ar ef ,
+.Ar va ,
 .Ar af11 No ... Ar af43 ,
 .Ar cs0 No ... Ar cs7 ;
 or as either hex or decimal.
@@ -1738,6 +1739,7 @@ given as one of
 .Ar reliability ,
 or one of the DiffServ Code Points:
 .Ar ef ,
+.Ar va ,
 .Ar af11 No ... Ar af43 ,
 .Ar cs0 No ... Ar cs7 ;
 or as either hex or decimal.