X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=SubmittingPatches;h=99eb95391e87c0acd71bad856ab4c16f22d7d52a;hb=refs%2Fheads%2Fwdp;hp=917cddbf26ebabf0da6e89f4e2b33b99b8afa7e2;hpb=d17ee8689bff22541dccaa792b70a848641f3646;p=sliver-openvswitch.git

diff --git a/SubmittingPatches b/SubmittingPatches
index 917cddbf2..99eb95391 100644
--- 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
-vswitch's dependence on specifics of the dpif implementation.
+vswitch's dependence on specifics of the xfif implementation.
 ---
  vswitchd/bridge.c               |   23 +++++------------------
  vswitchd/ovs-vswitchd.conf.5.in |    3 +--
@@ -193,12 +193,12 @@ index 32647ea..00cffbc 100644
      /* Get rid of deleted bridges and add new bridges. */
      svec_sort(&old_br);
 @@ -793,7 +780,7 @@ bridge_create(const char *name)
-     br = xcalloc(1, sizeof *br);
+     br = xzalloc(sizeof *br);
  
-     error = dpif_create(name, &br->dpif);
+     error = xfif_create(name, &br->xfif);
 -    if (error == EEXIST) {
 +    if (error == EEXIST || error == EBUSY) {
-         error = dpif_open(name, &br->dpif);
+         error = xfif_open(name, &br->xfif);
          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