client: update LLDP-MED policy L2 priority values to match 802.1Q-2005

diff --git a/NEWS b/NEWS
index f641c8e191e8e8dfa139652f0f19bf492bc6a146..6e3cd64d65f96c2429dd35f6eb7b473ed8aae9e2 100644 (file)
--- 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 cd5807caf04a85444037d2f5b639304fe45443dc..36bbd5d1c0d5e50388dd957cac5fb199b304877f 100644 (file)
--- 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 34fb18d0de83d24024a6210a58cd311596b90122..89742e4360033997e4fa1c4dfe596edf694c87ba 100644 (file)
--- 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 },
        },