From 895d9b3e21ac9921d5325147a278c0715372ca65 Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Wed, 29 Oct 2025 15:05:58 -0500
Subject: [PATCH] Clause 21, enumerations for BACnetNetworkPortCommand conflict
 with final assigned values in multiple addenda. (#1124)

---
 CHANGELOG.md         | 2 ++
 src/bacnet/bacenum.h | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index febe5938..8e0c3285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,6 +112,8 @@ The git repositories are hosted at the following sites:
 
 ### Changed
 
+* Changed enumerations for BACnetNetworkPortCommand where there was a conflict
+  with final assigned values in multiple addenda. (#1124)
 * Changed CharacterString_Value_Out_Of_Service_Set() function to remove
   confusion about an assignment inside an if-statement. (#1113)
 * Changed device object unit test to use common read-write property test.
diff --git a/src/bacnet/bacenum.h b/src/bacnet/bacenum.h
index 8bf3990d..db2e4b44 100644
--- a/src/bacnet/bacenum.h
+++ b/src/bacnet/bacenum.h
@@ -2781,9 +2781,9 @@ typedef enum BACnetNetworkPortCommand {
     PORT_COMMAND_RESTART_AUTONEGOTIATION = 5,
     PORT_COMMAND_DISCONNECT = 6,
     PORT_COMMAND_RESTART_PORT = 7,
-    PORT_COMMAND_RESTART_DISCOVERY = 8,
-    PORT_COMMAND_GENERATE_CSR_FILE = 9,
-    PORT_COMMAND_VALIDATE_CHANGES = 10,
+    PORT_COMMAND_GENERATE_CSR_FILE = 8,
+    PORT_COMMAND_VALIDATE_CHANGES = 9,
+    PORT_COMMAND_RESTART_DISCOVERY = 10,
     PORT_COMMAND_RESERVED_MIN = 11,
     PORT_COMMAND_RESERVED_MAX = 127,
     /* Enumerated values 0-127 are reserved for definition by ASHRAE.