summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-07-05 05:48:21 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-07-05 16:35:11 +0900
commit412ac780acdc9ba431dc0d1a0bd0e3a81cce1f33 (patch)
tree697de7d82e44ca86b87712920f68c8ad759fbcfc
parentfb721f084c8e013dc696d92aa7aa74f5ac606a9b (diff)
downloadsystemd-412ac780acdc9ba431dc0d1a0bd0e3a81cce1f33.tar.gz
systemd-412ac780acdc9ba431dc0d1a0bd0e3a81cce1f33.tar.bz2
systemd-412ac780acdc9ba431dc0d1a0bd0e3a81cce1f33.zip
network: fix the initial value of the counter for brvlan
Fixes #12958.
-rw-r--r--src/network/networkd-brvlan.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
index f7fa84e293..cadaaff91d 100644
--- a/src/network/networkd-brvlan.c
+++ b/src/network/networkd-brvlan.c
@@ -53,7 +53,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint
assert(br_vid_bitmap);
assert(br_untagged_bitmap);
- i = cnt = -1;
+ cnt = 0;
begin = end = UINT16_MAX;
for (k = 0; k < BRIDGE_VLAN_BITMAP_LEN; k++) {
@@ -129,9 +129,8 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint
i = j;
} while (!done);
}
- if (!cnt)
- return -EINVAL;
+ assert(cnt > 0);
return cnt;
}