Fix up merge.

diff --git a/datapath/actions.c b/datapath/actions.c
index d8caeb9..80b419c 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -70,7 +70,7 @@ static struct sk_buff *vlan_pull_tag(struct sk_buff *skb)
 }
 
 static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
-                                      struct xflow_key *key, const union xflow_action *a,
+                                      const struct xflow_key *key, const union xflow_action *a,
                                       int n_actions, gfp_t gfp)
 {
        __be16 mask = a->dl_tci.mask;

diff --git a/lib/netdev-gre.c b/lib/netdev-gre.c
index 81fd9b2..46355fb 100644 (file)
--- a/lib/netdev-gre.c
+++ b/lib/netdev-gre.c
@@ -151,7 +151,7 @@ netdev_gre_create(const char *name, const char *type OVS_UNUSED,
         return err;
     }
 
-    err = netdev_vpor_do_ioctl(XFLOW_VPORT_ADD, &ova);
+    err = netdev_vport_do_ioctl(XFLOW_VPORT_ADD, &ova);
     if (err == EBUSY) {
         VLOG_WARN("%s: destroying existing device", name);
 

diff --git a/lib/xfif-netdev.c b/lib/xfif-netdev.c
index 58b054b..318a979 100644 (file)
--- a/lib/xfif-netdev.c
+++ b/lib/xfif-netdev.c
@@ -1359,6 +1359,7 @@ const struct xfif_class xfif_netdev_class = {
     xfif_netdev_recv_set_mask,
     NULL,                       /* get_sflow_probability */
     NULL,                       /* set_sflow_probability */
+    NULL,                       /* queue_to_priority */
     xfif_netdev_recv,
     xfif_netdev_recv_wait,
 };

diff --git a/lib/xfif.c b/lib/xfif.c
index 4eda1df..50c4780 100644 (file)
--- a/lib/xfif.c
+++ b/lib/xfif.c
@@ -1103,17 +1103,17 @@ xfif_get_netflow_ids(const struct xfif *xfif,
  * stores the priority into '*priority'.  On failure, returns a positive errno
  * value and stores 0 into '*priority'. */
 int
-dpif_queue_to_priority(const struct dpif *dpif, uint32_t queue_id,
+xfif_queue_to_priority(const struct xfif *xfif, uint32_t queue_id,
                        uint32_t *priority)
 {
-    int error = (dpif->dpif_class->queue_to_priority
-                 ? dpif->dpif_class->queue_to_priority(dpif, queue_id,
+    int error = (xfif->xfif_class->queue_to_priority
+                 ? xfif->xfif_class->queue_to_priority(xfif, queue_id,
                                                        priority)
                  : EOPNOTSUPP);
     if (error) {
         *priority = 0;
     }
-    log_operation(dpif, "queue_to_priority", error);
+    log_operation(xfif, "queue_to_priority", error);
     return error;
 }
 \f

diff --git a/ofproto/wdp-xflow.c b/ofproto/wdp-xflow.c
index 49dd2ff..4a78e16 100644 (file)
--- a/ofproto/wdp-xflow.c
+++ b/ofproto/wdp-xflow.c
@@ -763,7 +763,7 @@ xlate_output_action__(struct wx_xlate_ctx *ctx,
 }
 
 static void
-xlate_output_action(struct action_xlate_ctx *ctx,
+xlate_output_action(struct wx_xlate_ctx *ctx,
                     const struct ofp_action_output *oao)
 {
     xlate_output_action__(ctx, ntohs(oao->port), ntohs(oao->max_len));