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

network: merge ipip_init() and sit_init()

Browse Source
This commit is contained in:
Yu Watanabe
2019-04-02 03:07:08 +09:00
parent 4799d932b5
commit a27a0ad641
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/tunnel.c
+14 -12
View File
@@ -683,20 +683,22 @@ int config_parse_6rd_prefix(const char* unit,
return 0;
}
static void ipip_init(NetDev *n) {
Tunnel *t = IPIP(n);
static void ipip_sit_init(NetDev *n) {
Tunnel *t;
assert(n);
assert(t);
t->pmtudisc = true;
t->fou_encap_type = FOU_ENCAP_DIRECT;
}
switch (n->kind) {
case NETDEV_KIND_IPIP:
t = IPIP(n);
break;
case NETDEV_KIND_SIT:
t = SIT(n);
break;
default:
assert_not_reached("invalid netdev kind");
}
static void sit_init(NetDev *n) {
Tunnel *t = SIT(n);
assert(n);
assert(t);
t->pmtudisc = true;
@@ -775,7 +777,7 @@ static void ip6tnl_init(NetDev *n) {
const NetDevVTable ipip_vtable = {
.object_size = sizeof(Tunnel),
.init = ipip_init,
.init = ipip_sit_init,
.sections = "Match\0NetDev\0Tunnel\0",
.fill_message_create = netdev_ipip_sit_fill_message_create,
.create_type = NETDEV_CREATE_STACKED,
@@ -784,7 +786,7 @@ const NetDevVTable ipip_vtable = {
const NetDevVTable sit_vtable = {
.object_size = sizeof(Tunnel),
.init = sit_init,
.init = ipip_sit_init,
.sections = "Match\0NetDev\0Tunnel\0",
.fill_message_create = netdev_ipip_sit_fill_message_create,
.create_type = NETDEV_CREATE_STACKED,