From 8f65304c5d68ec10ab7cbe685e92261b84c73914 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 12 Aug 2021 14:23:54 +0900 Subject: [PATCH] network: use netdev_enter_failed() instead of netdev_drop() on error Preparation for later commits to support reconfiguring netdevs. --- src/network/netdev/bareudp.c | 2 +- src/network/netdev/fou-tunnel.c | 2 +- src/network/netdev/geneve.c | 2 +- src/network/netdev/l2tp-tunnel.c | 2 +- src/network/netdev/macsec.c | 8 ++++---- src/network/netdev/netdev.c | 5 ++--- src/network/netdev/netdev.h | 1 + 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c index 22c0e49d94..e210625ac5 100644 --- a/src/network/netdev/bareudp.c +++ b/src/network/netdev/bareudp.c @@ -29,7 +29,7 @@ static int bare_udp_netdev_create_handler(sd_netlink *rtnl, sd_netlink_message * log_netdev_info(netdev, "BareUDP netdev exists, using existing without changing its parameters."); else if (r < 0) { log_netdev_warning_errno(netdev, r, "BareUDP netdev could not be created: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c index 0ed0df7579..e01de0f151 100644 --- a/src/network/netdev/fou-tunnel.c +++ b/src/network/netdev/fou-tunnel.c @@ -108,7 +108,7 @@ static int fou_tunnel_create_handler(sd_netlink *rtnl, sd_netlink_message *m, Ne log_netdev_info(netdev, "netdev exists, using existing without changing its parameters"); else if (r < 0) { log_netdev_warning_errno(netdev, r, "netdev could not be created: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c index fd0b5119e7..b0baa53edc 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -37,7 +37,7 @@ static int geneve_netdev_create_handler(sd_netlink *rtnl, sd_netlink_message *m, log_netdev_info(netdev, "Geneve netdev exists, using existing without changing its parameters"); else if (r < 0) { log_netdev_warning_errno(netdev, r, "Geneve netdev could not be created: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index 32ec024558..f651b2f7bf 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -355,7 +355,7 @@ static int l2tp_create_tunnel_handler(sd_netlink *rtnl, sd_netlink_message *m, N log_netdev_info(netdev, "netdev exists, using existing without changing its parameters"); else if (r < 0) { log_netdev_warning_errno(netdev, r, "netdev could not be created: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index 77c5f8c4e7..74e9fdd10b 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -317,7 +317,7 @@ static int macsec_receive_association_handler(sd_netlink *rtnl, sd_netlink_messa else if (r < 0) { log_netdev_warning_errno(netdev, r, "Failed to add receive secure association: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } @@ -375,7 +375,7 @@ static int macsec_receive_channel_handler(sd_netlink *rtnl, sd_netlink_message * else if (r < 0) { log_netdev_warning_errno(netdev, r, "Failed to add receive secure channel: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } @@ -387,7 +387,7 @@ static int macsec_receive_channel_handler(sd_netlink *rtnl, sd_netlink_message * if (r < 0) { log_netdev_warning_errno(netdev, r, "Failed to configure receive security association: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } } @@ -441,7 +441,7 @@ static int macsec_transmit_association_handler(sd_netlink *rtnl, sd_netlink_mess else if (r < 0) { log_netdev_warning_errno(netdev, r, "Failed to add transmit secure association: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index ebd99a4c8d..2a97dbea6e 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -268,9 +268,8 @@ int netdev_get(Manager *manager, const char *name, NetDev **ret) { return 0; } -static int netdev_enter_failed(NetDev *netdev) { +void netdev_enter_failed(NetDev *netdev) { netdev->state = NETDEV_STATE_FAILED; - return 0; } static int netdev_enter_ready(NetDev *netdev) { @@ -302,7 +301,7 @@ static int netdev_create_handler(sd_netlink *rtnl, sd_netlink_message *m, NetDev log_netdev_info(netdev, "netdev exists, using existing without changing its parameters"); else if (r < 0) { log_netdev_warning_errno(netdev, r, "netdev could not be created: %m"); - netdev_drop(netdev); + netdev_enter_failed(netdev); return 1; } diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 493ae32b22..29eec8d553 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -184,6 +184,7 @@ extern const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX]; int netdev_load(Manager *manager, bool reload); int netdev_load_one(Manager *manager, const char *filename); void netdev_drop(NetDev *netdev); +void netdev_enter_failed(NetDev *netdev); NetDev *netdev_unref(NetDev *netdev); NetDev *netdev_ref(NetDev *netdev);