git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag sliver-openvswitch-1.10.90-3
[sliver-openvswitch.git]
/
lib
/
netdev-dummy.c
diff --git
a/lib/netdev-dummy.c
b/lib/netdev-dummy.c
index
3e2187e
..
a940df8
100644
(file)
--- a/
lib/netdev-dummy.c
+++ b/
lib/netdev-dummy.c
@@
-129,7
+129,7
@@
netdev_dummy_run(void)
list_init(&s->txq);
} else if (error != EAGAIN) {
VLOG_WARN("%s: accept failed (%s)",
list_init(&s->txq);
} else if (error != EAGAIN) {
VLOG_WARN("%s: accept failed (%s)",
- pstream_get_name(dev->pstream), strerror(error));
+ pstream_get_name(dev->pstream),
ovs_
strerror(error));
pstream_close(dev->pstream);
dev->pstream = NULL;
}
pstream_close(dev->pstream);
dev->pstream = NULL;
}
@@
-322,7
+322,8
@@
netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args)
error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT);
if (error) {
error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT);
if (error) {
- VLOG_WARN("%s: open failed (%s)", pstream, strerror(error));
+ VLOG_WARN("%s: open failed (%s)",
+ pstream, ovs_strerror(error));
}
}
}
}
}
}
@@
-623,7
+624,7
@@
eth_from_packet_or_flow(const char *s)
* settle for parsing a datapath key for now.
*/
ofpbuf_init(&odp_key, 0);
* settle for parsing a datapath key for now.
*/
ofpbuf_init(&odp_key, 0);
- error = odp_flow_
key_from_string(s, NULL, &odp_key
);
+ error = odp_flow_
from_string(s, NULL, &odp_key, NULL
);
if (error) {
ofpbuf_uninit(&odp_key);
return NULL;
if (error) {
ofpbuf_uninit(&odp_key);
return NULL;