shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 00:51:24 +03:00
Code

Merge pull request #6704 from andir/fix_vrf_table_identifier

Browse Source 
VRF documentation, parameter renames & parsing of RT names
This commit is contained in:
Lennart Poettering 2017-08-31 13:46:25 +02:00 committed by GitHub
commit 702b64846e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.netdev.xml
View File

@ -1314,7 +1314,7 @@ Name=vrf-test
Kind=vrf
[VRF]
TableId=42</programlisting>
Table=42</programlisting>
</example>
<example>

3
src/network/netdev/netdev-gperf.gperf
View File

@ -133,4 +133,5 @@ Bridge.MulticastQuerier, config_parse_tristate, 0,
Bridge.MulticastSnooping, config_parse_tristate, 0, offsetof(Bridge, mcast_snooping)
Bridge.VLANFiltering, config_parse_tristate, 0, offsetof(Bridge, vlan_filtering)
Bridge.STP, config_parse_tristate, 0, offsetof(Bridge, stp)
VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table_id)
VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */
VRF.Table, config_parse_route_table, 0, offsetof(Vrf, table)

2
src/network/netdev/vrf.c
View File

@ -35,7 +35,7 @@ static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink
assert(v);
r = sd_netlink_message_append_u32(m, IFLA_VRF_TABLE, v->table_id);
r = sd_netlink_message_append_u32(m, IFLA_VRF_TABLE, v->table);
if (r < 0)
return log_netdev_error_errno(netdev, r, "Could not append IPLA_VRF_TABLE attribute: %m");

2
src/network/netdev/vrf.h
View File

@ -26,7 +26,7 @@ typedef struct Vrf Vrf;
struct Vrf {
NetDev meta;
uint32_t table_id;
uint32_t table;
};
DEFINE_NETDEV_CAST(VRF, Vrf);