python: Implement write support in Python IDL for OVSDB.

[sliver-openvswitch.git] / ofproto / ofproto-dpif-sflow.c

diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index d41b7da..68eb804 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -34,6 +34,7 @@
 #include "socket-util.h"
 #include "timeval.h"
 #include "vlog.h"
+#include "lib/odp-util.h"
 
 VLOG_DEFINE_THIS_MODULE(sflow);
 
@@ -489,7 +490,8 @@ dpif_sflow_received(struct dpif_sflow *ds, const struct dpif_upcall *upcall,
 
     /* Build a flow sample */
     memset(&fs, 0, sizeof fs);
-    fs.input = dpif_sflow_odp_port_to_ifindex(ds, flow->in_port);
+    fs.input = dpif_sflow_odp_port_to_ifindex(ds,
+                                ofp_port_to_odp_port(flow->in_port));
     fs.output = 0;              /* Filled in correctly below. */
     fs.sample_pool = upcall->sample_pool;
 
@@ -538,7 +540,7 @@ dpif_sflow_received(struct dpif_sflow *ds, const struct dpif_upcall *upcall,
             n_outputs++;
             break;
 
-        case OVS_ACTION_ATTR_SET_DL_TCI:
+        case OVS_ACTION_ATTR_PUSH_VLAN:
             tci = nl_attr_get_be16(a);
             switchElem.flowType.sw.dst_vlan = vlan_tci_to_vid(tci);
             switchElem.flowType.sw.dst_priority = vlan_tci_to_pcp(tci);