X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-sflow.h;h=d53c95c98b6aeb9aa2c4d675ec6259c0e3178040;hb=HEAD;hp=acafa328089c98b4d593676cb96aa48e0b3c7f86;hpb=bae473fea5404a5afd205c70689778386045ebab;p=sliver-openvswitch.git

diff --git a/ofproto/ofproto-dpif-sflow.h b/ofproto/ofproto-dpif-sflow.h
index acafa3280..d53c95c98 100644
--- a/ofproto/ofproto-dpif-sflow.h
+++ b/ofproto/ofproto-dpif-sflow.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009, 2010 InMon Corp.
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,27 +20,39 @@
 
 #include <stdint.h>
 #include "svec.h"
+#include "lib/odp-util.h"
 
 struct dpif;
 struct dpif_upcall;
 struct flow;
 struct ofproto_sflow_options;
+struct ofport;
+
+struct dpif_sflow *dpif_sflow_create(void);
+struct dpif_sflow *dpif_sflow_ref(const struct dpif_sflow *);
+void dpif_sflow_unref(struct dpif_sflow *);
+
+uint32_t dpif_sflow_get_probability(const struct dpif_sflow *);
 
-struct dpif_sflow *dpif_sflow_create(struct dpif *);
-void dpif_sflow_destroy(struct dpif_sflow *);
 void dpif_sflow_set_options(struct dpif_sflow *,
                             const struct ofproto_sflow_options *);
 void dpif_sflow_clear(struct dpif_sflow *);
 bool dpif_sflow_is_enabled(const struct dpif_sflow *);
 
-void dpif_sflow_add_port(struct dpif_sflow *, uint16_t odp_port,
-                         const char *netdev_name);
-void dpif_sflow_del_port(struct dpif_sflow *, uint16_t odp_port);
+void dpif_sflow_add_port(struct dpif_sflow *ds, struct ofport *ofport,
+                         odp_port_t odp_port);
+void dpif_sflow_del_port(struct dpif_sflow *, odp_port_t odp_port);
 
 void dpif_sflow_run(struct dpif_sflow *);
 void dpif_sflow_wait(struct dpif_sflow *);
 
-void dpif_sflow_received(struct dpif_sflow *, const struct dpif_upcall *,
-                         const struct flow *);
+void dpif_sflow_received(struct dpif_sflow *,
+                         struct ofpbuf *,
+                         const struct flow *,
+                         odp_port_t odp_port,
+                         const union user_action_cookie *);
+
+int dpif_sflow_odp_port_to_ifindex(const struct dpif_sflow *,
+                                   odp_port_t odp_port);
 
 #endif /* ofproto/ofproto-dpif-sflow.h */