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
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
ofproto
/
fail-open.c
diff --git
a/ofproto/fail-open.c
b/ofproto/fail-open.c
index
40859a4
..
b29e5af
100644
(file)
--- a/
ofproto/fail-open.c
+++ b/
ofproto/fail-open.c
@@
-125,11
+125,12
@@
send_bogus_packet_ins(struct fail_open *fo)
compose_rarp(&b, mac);
memset(&pin, 0, sizeof pin);
compose_rarp(&b, mac);
memset(&pin, 0, sizeof pin);
- pin.up.packet =
b.data
;
- pin.up.packet_len =
b.size
;
+ pin.up.packet =
ofpbuf_data(&b)
;
+ pin.up.packet_len =
ofpbuf_size(&b)
;
pin.up.reason = OFPR_NO_MATCH;
pin.up.reason = OFPR_NO_MATCH;
- pin.up.send_len = b.size;
pin.up.fmd.in_port = OFPP_LOCAL;
pin.up.fmd.in_port = OFPP_LOCAL;
+ pin.send_len = ofpbuf_size(&b);
+ pin.miss_type = OFPROTO_PACKET_IN_NO_MISS;
connmgr_send_packet_in(fo->connmgr, &pin);
ofpbuf_uninit(&b);
connmgr_send_packet_in(fo->connmgr, &pin);
ofpbuf_uninit(&b);
@@
-181,6
+182,7
@@
fail_open_run(struct fail_open *fo)
* controller, exits fail open mode. */
void
fail_open_maybe_recover(struct fail_open *fo)
* controller, exits fail open mode. */
void
fail_open_maybe_recover(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
if (fail_open_is_active(fo)
&& connmgr_is_any_controller_admitted(fo->connmgr)) {
{
if (fail_open_is_active(fo)
&& connmgr_is_any_controller_admitted(fo->connmgr)) {
@@
-190,6
+192,7
@@
fail_open_maybe_recover(struct fail_open *fo)
static void
fail_open_recover(struct fail_open *fo)
static void
fail_open_recover(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
struct match match;
{
struct match match;
@@
-227,7
+230,7
@@
fail_open_flushed(struct fail_open *fo)
match_init_catchall(&match);
ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
match_init_catchall(&match);
ofproto_add_flow(fo->ofproto, &match, FAIL_OPEN_PRIORITY,
- ofp
acts.data, ofpacts.size
);
+ ofp
buf_data(&ofpacts), ofpbuf_size(&ofpacts)
);
ofpbuf_uninit(&ofpacts);
}
ofpbuf_uninit(&ofpacts);
}
@@
-249,6
+252,7
@@
fail_open_create(struct ofproto *ofproto, struct connmgr *mgr)
/* Destroys 'fo'. */
void
fail_open_destroy(struct fail_open *fo)
/* Destroys 'fo'. */
void
fail_open_destroy(struct fail_open *fo)
+ OVS_EXCLUDED(ofproto_mutex)
{
if (fo) {
if (fail_open_is_active(fo)) {
{
if (fo) {
if (fail_open_is_active(fo)) {