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]
/
ofproto
/
ofproto-dpif-monitor.h
diff --git
a/ofproto/ofproto-dpif-monitor.h
b/ofproto/ofproto-dpif-monitor.h
index
1f6be5c
..
2c466c2
100644
(file)
--- a/
ofproto/ofproto-dpif-monitor.h
+++ b/
ofproto/ofproto-dpif-monitor.h
@@
-17,6
+17,7
@@
#include <stdint.h>
#include <stdint.h>
+#include "openflow/openflow.h"
#include "packets.h"
struct bfd;
#include "packets.h"
struct bfd;
@@
-24,7
+25,6
@@
struct cfm;
struct ofport_dpif;
void ofproto_dpif_monitor_port_send_soon(const struct ofport_dpif *);
struct ofport_dpif;
void ofproto_dpif_monitor_port_send_soon(const struct ofport_dpif *);
-void ofproto_dpif_monitor_port_send_soon_safe(const struct ofport_dpif *);
void ofproto_dpif_monitor_port_update(const struct ofport_dpif *,
struct bfd *, struct cfm *,
void ofproto_dpif_monitor_port_update(const struct ofport_dpif *,
struct bfd *, struct cfm *,