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: Add Nicira extension to OpenFlow multiple flow tables support.
[sliver-openvswitch.git]
/
SubmittingPatches
diff --git
a/SubmittingPatches
b/SubmittingPatches
index
280f11e
..
99eb953
100644
(file)
--- a/
SubmittingPatches
+++ b/
SubmittingPatches
@@
-145,7
+145,7
@@
true (at the time) for bridges named dpN. Now that assumption has been
eliminated, so this commit eliminates the restriction too.
This change is also a cleanup in that it eliminates one form of the
eliminated, so this commit eliminates the restriction too.
This change is also a cleanup in that it eliminates one form of the
-vswitch's dependence on specifics of the
dp
if implementation.
+vswitch's dependence on specifics of the
xf
if implementation.
---
vswitchd/bridge.c | 23 +++++------------------
vswitchd/ovs-vswitchd.conf.5.in | 3 +--
---
vswitchd/bridge.c | 23 +++++------------------
vswitchd/ovs-vswitchd.conf.5.in | 3 +--
@@
-195,10
+195,10
@@
index 32647ea..00cffbc 100644
@@ -793,7 +780,7 @@ bridge_create(const char *name)
br = xzalloc(sizeof *br);
@@ -793,7 +780,7 @@ bridge_create(const char *name)
br = xzalloc(sizeof *br);
- error =
dpif_create(name, &br->dp
if);
+ error =
xfif_create(name, &br->xf
if);
- if (error == EEXIST) {
+ if (error == EEXIST || error == EBUSY) {
- if (error == EEXIST) {
+ if (error == EEXIST || error == EBUSY) {
- error =
dpif_open(name, &br->dp
if);
+ error =
xfif_open(name, &br->xf
if);
if (error) {
VLOG_ERR("datapath %s already exists but cannot be opened: %s",
diff --git a/vswitchd/ovs-vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in
if (error) {
VLOG_ERR("datapath %s already exists but cannot be opened: %s",
diff --git a/vswitchd/ovs-vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in