network: fix the initial value of the counter for brvlan
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 4 Jul 2019 20:48:21 +0000 (05:48 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 5 Jul 2019 07:35:11 +0000 (16:35 +0900)
Fixes #12958.

src/network/networkd-brvlan.c

index f7fa84e..cadaaff 100644 (file)
@@ -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;
 }