From 4f6b99348189f728a734aaf3b551410ee8b07f0c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 11 Dec 2013 10:50:10 -0800 Subject: [PATCH] netdev: Log a warning when netdev_set_config() fails. This allows its callers to avoid duplicating the code. Signed-off-by: Ben Pfaff Acked-by: Jarno Rajahalme --- lib/netdev.c | 12 +++++++++--- utilities/ovs-dpctl.c | 2 -- vswitchd/bridge.c | 9 +-------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/netdev.c b/lib/netdev.c index 5ed60624c..9aa6d27f7 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -386,13 +386,19 @@ netdev_set_config(struct netdev *netdev, const struct smap *args) { if (netdev->netdev_class->set_config) { const struct smap no_args = SMAP_INITIALIZER(&no_args); - return netdev->netdev_class->set_config(netdev, - args ? args : &no_args); + int error; + + error = netdev->netdev_class->set_config(netdev, + args ? args : &no_args); + if (error) { + VLOG_WARN("%s: could not set configuration (%s)", + netdev_get_name(netdev), ovs_strerror(error)); + } + return error; } else if (args && !smap_is_empty(args)) { VLOG_WARN("%s: arguments provided to device that is not configurable", netdev_get_name(netdev)); } - return 0; } diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c index 29f115158..bd9983475 100644 --- a/utilities/ovs-dpctl.c +++ b/utilities/ovs-dpctl.c @@ -350,7 +350,6 @@ dpctl_add_if(int argc OVS_UNUSED, char *argv[]) error = netdev_set_config(netdev, &args); if (error) { - ovs_error(error, "%s: failed to configure network device", name); goto next; } @@ -459,7 +458,6 @@ dpctl_set_if(int argc, char *argv[]) error = netdev_set_config(netdev, &args); smap_destroy(&args); if (error) { - ovs_error(error, "%s: failed to configure network device", name); goto next; } diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 957243ff0..8ccb8da2b 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1343,14 +1343,7 @@ static int iface_set_netdev_config(const struct ovsrec_interface *iface_cfg, struct netdev *netdev) { - int error; - - error = netdev_set_config(netdev, &iface_cfg->options); - if (error) { - VLOG_WARN("could not configure network device %s (%s)", - iface_cfg->name, ovs_strerror(error)); - } - return error; + return netdev_set_config(netdev, &iface_cfg->options); } /* This function determines whether 'ofproto_port', which is attached to -- 2.47.0