cleanup: VLAN Id -> VLAN ID

"VLAN ID" is used throughout the documentation and codebase, but appears
(when present) in `networkctl status` tables as `VLan Id`.

diff --git a/src/network/networkctl-status-link.c b/src/network/networkctl-status-link.c
index dc765a74f1216b6dd540e53bfe28f392dc855043..5083898ec3cec92627d1b5bba3ef1ce9938be34b 100644 (file)
--- a/src/network/networkctl-status-link.c
+++ b/src/network/networkctl-status-link.c
@@ -570,7 +570,7 @@ static int link_status_one(
 
         } else if (streq_ptr(info->netdev_kind, "vlan") && info->vlan_id > 0) {
                 r = table_add_many(table,
-                                   TABLE_FIELD, "VLan Id",
+                                   TABLE_FIELD, "VLAN ID",
                                    TABLE_UINT16, info->vlan_id);
                 if (r < 0)
                         return table_log_add_error(r);

diff --git a/src/network/networkd-bridge-fdb.c b/src/network/networkd-bridge-fdb.c
index 6a635a880185ad11353c1dc88a66f8dc16c10f1b..ff9356a444e6537f8f72047e2961cc4662616267 100644 (file)
--- a/src/network/networkd-bridge-fdb.c
+++ b/src/network/networkd-bridge-fdb.c
@@ -139,7 +139,7 @@ static int bridge_fdb_configure_message(const BridgeFDB *fdb, Link *link, sd_net
         if (r < 0)
                 return r;
 
-        /* VLAN Id is optional. We'll add VLAN Id only if it's specified. */
+        /* VLAN ID is optional. We'll add VLAN ID only if it's specified. */
         if (fdb->vlan_id > 0) {
                 r = sd_netlink_message_append_u16(req, NDA_VLAN, fdb->vlan_id);
                 if (r < 0)

diff --git a/src/shared/vlan-util.h b/src/shared/vlan-util.h
index b02001f23839765400f519d35a69c1bb5bf6fd8e..51efb3c7cccbd0ca0a7311352f1e149eacce6303 100644 (file)
--- a/src/shared/vlan-util.h
+++ b/src/shared/vlan-util.h
@@ -7,7 +7,7 @@
 #define VLANID_MAX 4094
 #define VLANID_INVALID UINT16_MAX
 
-/* Note that we permit VLAN Id 0 here, as that is apparently OK by the Linux kernel */
+/* Note that we permit VLAN ID 0 here, as that is apparently OK by the Linux kernel */
 static inline bool vlanid_is_valid(uint16_t id) {
         return id <= VLANID_MAX;
 }