From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 20 Apr 2010 05:14:43 +0000 (-0700)
Subject: xfif: Fix a couple of missed changes from "dpif" to "xfif"
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ab5ce30e10b348c4ecd20fc7bd6442d4c272ca58;p=sliver-openvswitch.git

xfif: Fix a couple of missed changes from "dpif" to "xfif"
---

diff --git a/lib/xfif-provider.h b/lib/xfif-provider.h
index 8730c5331..31de0aca1 100644
--- a/lib/xfif-provider.h
+++ b/lib/xfif-provider.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef DPIF_PROVIDER_H
-#define DPIF_PROVIDER_H 1
+#ifndef XFIF_PROVIDER_H
+#define XFIF_PROVIDER_H 1
 
 /* Provider interface to xfifs, which provide an interface to an Open vSwitch
  * datapath. */
diff --git a/lib/xfif.h b/lib/xfif.h
index da8234403..4059c8c43 100644
--- a/lib/xfif.h
+++ b/lib/xfif.h
@@ -15,8 +15,8 @@
  */
 
 
-#ifndef DPIF_H
-#define DPIF_H 1
+#ifndef XFIF_H
+#define XFIF_H 1
 
 #include "openvswitch/xflow.h"
 #include <stdbool.h>
diff --git a/ofproto/wdp-provider.h b/ofproto/wdp-provider.h
index b12ace9d2..4efb383d2 100644
--- a/ofproto/wdp-provider.h
+++ b/ofproto/wdp-provider.h
@@ -207,7 +207,7 @@ struct wdp_class {
     int (*port_list)(const struct wdp *wdp, struct wdp_port **portsp,
                      size_t *n_portsp);
 
-    int (*port_set_config)(struct wdp *sdpif, uint16_t port_no,
+    int (*port_set_config)(struct wdp *wdp, uint16_t port_no,
                            uint32_t config);
 
     /* Polls for changes in the set of ports in 'wdp'.  If the set of ports