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: Protect index by cookie with ofproto_mutex.
[sliver-openvswitch.git]
/
ofproto
/
ofproto-provider.h
diff --git
a/ofproto/ofproto-provider.h
b/ofproto/ofproto-provider.h
index
c9fd71e
..
bd40fbf
100644
(file)
--- a/
ofproto/ofproto-provider.h
+++ b/
ofproto/ofproto-provider.h
@@
-77,7
+77,8
@@
struct ofproto {
struct oftable *tables;
int n_tables;
struct oftable *tables;
int n_tables;
- struct hindex cookies; /* Rules indexed on their cookie values. */
+ /* Rules indexed on their cookie values, in all flow tables. */
+ struct hindex cookies OVS_GUARDED_BY(ofproto_mutex);
/* List of expirable flows, in all flow tables. */
struct list expirable OVS_GUARDED_BY(ofproto_mutex);
/* List of expirable flows, in all flow tables. */
struct list expirable OVS_GUARDED_BY(ofproto_mutex);
@@
-234,7
+235,7
@@
struct rule {
ovs_be64 flow_cookie; /* Controller-issued identifier. Guarded by
rwlock. */
ovs_be64 flow_cookie; /* Controller-issued identifier. Guarded by
rwlock. */
- struct hindex_node cookie_node
; /* In owning ofproto's 'cookies' index. */
+ struct hindex_node cookie_node
OVS_GUARDED_BY(ofproto_mutex);
long long int created; /* Creation time. */
long long int modified; /* Time of last modification. */
long long int created; /* Creation time. */
long long int modified; /* Time of last modification. */