SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: expose bridge_vlan_append_info()

Browse Source
This commit is contained in:
Yu Watanabe
2021-06-08 06:34:38 +09:00
parent 5546870e7b
commit 5106ad00e6
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-bridge-vlan.c
+8 -2
View File
@@ -42,7 +42,13 @@ static int find_next_bit(int i, uint32_t x) {
return j ? j + i : 0;
}
static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint16_t pvid, const uint32_t *br_vid_bitmap, const uint32_t *br_untagged_bitmap) {
int bridge_vlan_append_info(
const Link *link,
sd_netlink_message *req,
uint16_t pvid,
const uint32_t *br_vid_bitmap,
const uint32_t *br_untagged_bitmap) {
struct bridge_vlan_info br_vlan;
bool done, untagged = false;
uint16_t begin, end;
@@ -183,7 +189,7 @@ int link_set_bridge_vlan(Link *link) {
}
/* add vlan info */
r = append_vlan_info_data(link, req, link->network->pvid, link->network->br_vid_bitmap, link->network->br_untagged_bitmap);
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_error_errno(link, r, "Could not append VLANs: %m");
src/network/networkd-bridge-vlan.h
+11
View File
@@ -5,6 +5,10 @@
Copyright © 2016 BISDN GmbH. All rights reserved.
***/
#include <inttypes.h>
#include "sd-netlink.h"
#include "conf-parser.h"
#define BRIDGE_VLAN_BITMAP_MAX 4096
@@ -15,6 +19,13 @@ typedef struct Network Network;
void network_adjust_bridge_vlan(Network *network);
int bridge_vlan_append_info(
const Link * link,
sd_netlink_message *req,
uint16_t pvid,
const uint32_t *br_vid_bitmap,
const uint32_t *br_untagged_bitmap);
int link_set_bridge_vlan(Link *link);
CONFIG_PARSER_PROTOTYPE(config_parse_brvlan_pvid);