From c56e4067b90c1ff02d2389c0a51908d4abfc3447 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 15 Dec 2015 09:50:35 +0100
Subject: [PATCH] client: update LLDP-MED policy L2 priority values to match
 802.1Q-2005

---
 NEWS                    |  4 ++--
 src/client/lldpcli.8.in | 12 ++++++------
 src/lib/atoms/med.c     | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/NEWS b/NEWS
index f641c8e1..6e3cd64d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ lldpd (0.8.0)
     + Fix a buffer overflow when receiving a too large management
       address TLV. Unless hardening has been disabled, this overflow
       cannot be used for arbitrary code execution.
-    + Change the numeric value for LLDP-MED policy L2 priority value
-      for "Best effort" to 0 to match 802.1D-2004.
+    + Update LLDP-MED policy L2 priority values to match
+      802.1Q-2005. This may be a breaking change.
   * Change:
     + PIE is now disabled by default. It's too difficult to reliably
       detect if it works. Use --enable-pie to enable it.
diff --git a/src/client/lldpcli.8.in b/src/client/lldpcli.8.in
index cd5807ca..36bbd5d1 100644
--- a/src/client/lldpcli.8.in
+++ b/src/client/lldpcli.8.in
@@ -649,18 +649,18 @@ should be relied upon. The accepted labels are:
 .Bl -tag -width "X." -compact -offset XXXX
 .It Sy 1
 background
-.It Sy 2
-spare
 .It Sy 0
 best-effort
-.It Sy 3
+.It Sy 2
 excellent-effort
+.It Sy 3
+critical-applications
 .It Sy 4
-controlled-load
-.It Sy 5
 video
-.It Sy 6
+.It Sy 5
 voice
+.It Sy 6
+internetwork-control
 .It Sy 7
 network-control
 .El
diff --git a/src/lib/atoms/med.c b/src/lib/atoms/med.c
index 34fb18d0..89742e43 100644
--- a/src/lib/atoms/med.c
+++ b/src/lib/atoms/med.c
@@ -118,12 +118,12 @@ static struct atom_map port_med_policy_prio_map = {
 	.key = lldpctl_k_med_policy_priority,
 	.map = {
 		{ 1, "Background" },
-		{ 2, "Spare" },
 		{ 0, "Best effort" },
-		{ 3, "Excellent effort" },
-		{ 4, "Controlled load" },
-		{ 5, "Video" },
-		{ 6, "Voice" },
+		{ 2, "Excellent effort" },
+		{ 3, "Critical applications" },
+		{ 4, "Video" },
+		{ 5, "Voice" },
+		{ 6, "Internetwork control" },
 		{ 7, "Network control" },
 		{ 0, NULL },
 	},
-- 
2.39.5