From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Jan 2022 10:05:02 +0000 (+0100)
Subject: network: de-duplicate logging in bridge_vlan_append_info() and the caller
X-Git-Tag: v251-rc1~589^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a3cca04c494f061226174aa4ccd6dec48e8bcd7;p=thirdparty%2Fsystemd.git

network: de-duplicate logging in bridge_vlan_append_info() and the caller

The remaining message is changed, because the user would most likely not
understand that "append VLANs" is just talking about the netlink message.
---

diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c
index 3153bf6984f..36e3610a8f9 100644
--- a/src/network/networkd-bridge-vlan.c
+++ b/src/network/networkd-bridge-vlan.c
@@ -65,11 +65,9 @@ int bridge_vlan_append_info(
         for (int k = 0; k < BRIDGE_VLAN_BITMAP_LEN; k++) {
                 uint32_t untagged_map = br_untagged_bitmap[k];
                 uint32_t vid_map = br_vid_bitmap[k];
-                unsigned base_bit;
-                int i;
+                unsigned base_bit = k * 32;
+                int i = -1;
 
-                base_bit = k * 32;
-                i = -1;
                 done = false;
                 do {
                         int j = find_next_bit(i, vid_map);
@@ -106,14 +104,14 @@ int bridge_vlan_append_info(
 
                                         r = sd_netlink_message_append_data(req, IFLA_BRIDGE_VLAN_INFO, &br_vlan, sizeof(br_vlan));
                                         if (r < 0)
-                                                return log_link_error_errno(link, r, "Could not append IFLA_BRIDGE_VLAN_INFO attribute: %m");
+                                                return r;
                                 } else {
                                         br_vlan.vid = begin;
                                         br_vlan.flags |= BRIDGE_VLAN_INFO_RANGE_BEGIN;
 
                                         r = sd_netlink_message_append_data(req, IFLA_BRIDGE_VLAN_INFO, &br_vlan, sizeof(br_vlan));
                                         if (r < 0)
-                                                return log_link_error_errno(link, r, "Could not append IFLA_BRIDGE_VLAN_INFO attribute: %m");
+                                                return r;
 
                                         br_vlan.vid = end;
                                         br_vlan.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
@@ -121,7 +119,7 @@ int bridge_vlan_append_info(
 
                                         r = sd_netlink_message_append_data(req, IFLA_BRIDGE_VLAN_INFO, &br_vlan, sizeof(br_vlan));
                                         if (r < 0)
-                                                return log_link_error_errno(link, r, "Could not append IFLA_BRIDGE_VLAN_INFO attribute: %m");
+                                                return r;
                                 }
 
                                 if (done)
diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
index 2fcca1f5c0c..33b539c1e8e 100644
--- a/src/network/networkd-setlink.c
+++ b/src/network/networkd-setlink.c
@@ -422,7 +422,7 @@ static int link_configure(
 
                 r = bridge_vlan_append_info(link, req, link->network->pvid, link->network->br_vid_bitmap, link->network->br_untagged_bitmap);
                 if (r < 0)
-                        return log_link_debug_errno(link, r, "Could not append VLANs: %m");
+                        return log_link_debug_errno(link, r, "Could not append VLAN information to netlink message: %m");
 
                 r = sd_netlink_message_close_container(req);
                 if (r < 0)