projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make installation directories overridable at runtime.
[openvswitch]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index 5ea7cbd2ddb27fb6f5442e384b7f71eacc3850d3..197e74bb24b54f1754affc9ecd43ae3329461123 100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-110,7
+110,7
@@
netdev_vport_parse_config(const struct netdev_class *netdev_class,
info.devname = name;
info.type = netdev_class->type;
error = (c->parse_config)(&info, args);
info.devname = name;
info.type = netdev_class->type;
error = (c->parse_config)(&info, args);
- *configp = info.config;
+ *configp =
error ? NULL :
info.config;
return error;
} else {
if (!shash_is_empty(args)) {
return error;
} else {
if (!shash_is_empty(args)) {
@@
-124,8
+124,7
@@
netdev_vport_parse_config(const struct netdev_class *netdev_class,
static int
netdev_vport_create(const struct netdev_class *class, const char *name,
static int
netdev_vport_create(const struct netdev_class *class, const char *name,
- const struct shash *args OVS_UNUSED,
- struct netdev_dev **netdev_devp)
+ const struct shash *args, struct netdev_dev **netdev_devp)
{
int err;
struct odp_vport_add ova;
{
int err;
struct odp_vport_add ova;
@@
-386,8
+385,7
@@
netdev_vport_poll_add(struct netdev *netdev,
if (!shash_node) {
list = xmalloc(sizeof *list);
list_init(list);
if (!shash_node) {
list = xmalloc(sizeof *list);
list_init(list);
- shash_node = shash_add(&netdev_vport_notifiers,
- netdev_get_name(netdev), list);
+ shash_node = shash_add(&netdev_vport_notifiers, poll_name, list);
} else {
list = shash_node->data;
}
} else {
list = shash_node->data;
}