projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Introduce "internal flows" for handling flow table misses.
[openvswitch]
/
ovsdb
/
trigger.c
diff --git
a/ovsdb/trigger.c
b/ovsdb/trigger.c
index b2eb0116fff49ed6bc9d30a5c3f19d28218fc998..6ae1f516b5754b89212607352a223714727dedd9 100644
(file)
--- a/
ovsdb/trigger.c
+++ b/
ovsdb/trigger.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010, 2011 Nicira
Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira
, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-110,8
+110,8
@@
ovsdb_trigger_wait(struct ovsdb *db, long long int now)
static bool
ovsdb_trigger_try(struct ovsdb_trigger *t, long long int now)
{
static bool
ovsdb_trigger_try(struct ovsdb_trigger *t, long long int now)
{
- t->result = ovsdb_execute(t->session->db, t->
request
,
- now - t->created, &t->timeout_msec);
+ t->result = ovsdb_execute(t->session->db, t->
session
,
+
t->request,
now - t->created, &t->timeout_msec);
if (t->result) {
ovsdb_trigger_complete(t);
return true;
if (t->result) {
ovsdb_trigger_complete(t);
return true;