From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 26 Feb 2022 03:18:06 +0000 (+0900)
Subject: network: netdev: drop NETDEV_CREATE_MASTER
X-Git-Tag: v251-rc1~217^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97b2bc35061c360e07eaaef2cb7ab18d3197c5ec;p=thirdparty%2Fsystemd.git

network: netdev: drop NETDEV_CREATE_MASTER

As there is no deference between NETDEV_CREATE_MASTER and
NETDEV_CREATE_INDEPENDENT.
---

diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c
index c8650f3d9b5..7e97619657a 100644
--- a/src/network/netdev/batadv.c
+++ b/src/network/netdev/batadv.c
@@ -210,7 +210,7 @@ const NetDevVTable batadv_vtable = {
         .sections = NETDEV_COMMON_SECTIONS "BatmanAdvanced\0",
         .fill_message_create = netdev_batadv_fill_message_create,
         .post_create = netdev_batadv_post_create,
-        .create_type = NETDEV_CREATE_MASTER,
+        .create_type = NETDEV_CREATE_INDEPENDENT,
         .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };
diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
index b0af12c8e27..601bff0a9c0 100644
--- a/src/network/netdev/bond.c
+++ b/src/network/netdev/bond.c
@@ -451,7 +451,7 @@ const NetDevVTable bond_vtable = {
         .done = bond_done,
         .sections = NETDEV_COMMON_SECTIONS "Bond\0",
         .fill_message_create = netdev_bond_fill_message_create,
-        .create_type = NETDEV_CREATE_MASTER,
+        .create_type = NETDEV_CREATE_INDEPENDENT,
         .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };
diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 401d35e844e..b65c3b49fc2 100644
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -284,7 +284,7 @@ const NetDevVTable bridge_vtable = {
         .init = bridge_init,
         .sections = NETDEV_COMMON_SECTIONS "Bridge\0",
         .post_create = netdev_bridge_post_create,
-        .create_type = NETDEV_CREATE_MASTER,
+        .create_type = NETDEV_CREATE_INDEPENDENT,
         .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };
diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h
index 5c695b201f0..66ee77fd805 100644
--- a/src/network/netdev/netdev.h
+++ b/src/network/netdev/netdev.h
@@ -102,7 +102,6 @@ typedef enum NetDevState {
 
 typedef enum NetDevCreateType {
         NETDEV_CREATE_INDEPENDENT,
-        NETDEV_CREATE_MASTER,
         NETDEV_CREATE_STACKED,
         NETDEV_CREATE_AFTER_CONFIGURED,
         _NETDEV_CREATE_MAX,
diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
index 9f75eb63cf9..05ef3ff13d3 100644
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
@@ -29,7 +29,7 @@ const NetDevVTable vrf_vtable = {
         .object_size = sizeof(Vrf),
         .sections = NETDEV_COMMON_SECTIONS "VRF\0",
         .fill_message_create = netdev_vrf_fill_message_create,
-        .create_type = NETDEV_CREATE_MASTER,
+        .create_type = NETDEV_CREATE_INDEPENDENT,
         .iftype = ARPHRD_ETHER,
         .generate_mac = true,
 };