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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
dpif.c
diff --git
a/lib/dpif.c
b/lib/dpif.c
index
3d6aed7
..
1c1a524
100644
(file)
--- a/
lib/dpif.c
+++ b/
lib/dpif.c
@@
-61,6
+61,7
@@
static const struct dpif_class *base_dpif_classes[] = {
&dpif_linux_class,
#endif
&dpif_netdev_class,
&dpif_linux_class,
#endif
&dpif_netdev_class,
+ &dpif_planetlab_class,
};
struct registered_dpif_class {
};
struct registered_dpif_class {
@@
-1351,7
+1352,7
@@
log_flow_message(const struct dpif *dpif, int error, const char *operation,
if (error) {
ds_put_format(&ds, "(%s) ", ovs_strerror(error));
}
if (error) {
ds_put_format(&ds, "(%s) ", ovs_strerror(error));
}
- odp_flow_format(key, key_len, mask, mask_len, &ds);
+ odp_flow_format(key, key_len, mask, mask_len, &ds
, true
);
if (stats) {
ds_put_cstr(&ds, ", ");
dpif_flow_stats_format(stats, &ds);
if (stats) {
ds_put_cstr(&ds, ", ");
dpif_flow_stats_format(stats, &ds);