mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

netdev: Log a warning when netdev_set_config() fails.

Browse Source 
This allows its callers to avoid duplicating the code.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
This commit is contained in:
Ben Pfaff
2013-12-11 10:50:10 -08:00
parent 202a4b176e
commit 4f6b993481
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/netdev.c
View File

@@ -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,
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;
}

2
utilities/ovs-dpctl.c
View File

@@ -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;
}

9
vswitchd/bridge.c
View File

@@ -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