Merge "master" into "wdp".

[sliver-openvswitch.git] / ofproto / ofproto-sflow.h

diff --git a/ofproto/ofproto-sflow.h b/ofproto/ofproto-sflow.h
index ec86d11..492de22 100644 (file)
--- a/ofproto/ofproto-sflow.h
+++ b/ofproto/ofproto-sflow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 InMon Corp.
+ * Copyright (c) 2009, 2010 InMon Corp.
  * Copyright (c) 2009 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,26 +21,26 @@
 #include <stdint.h>
 #include "svec.h"
 
-struct dpif;
-struct odp_msg;
 struct ofproto_sflow_options;
+struct wdp;
+struct xflow_msg;
 
-struct ofproto_sflow *ofproto_sflow_create(struct dpif *);
+struct ofproto_sflow *ofproto_sflow_create(struct wdp *);
 void ofproto_sflow_destroy(struct ofproto_sflow *);
 void ofproto_sflow_set_options(struct ofproto_sflow *,
                                const struct ofproto_sflow_options *);
 void ofproto_sflow_clear(struct ofproto_sflow *);
 bool ofproto_sflow_is_enabled(const struct ofproto_sflow *);
 
-void ofproto_sflow_add_port(struct ofproto_sflow *, uint16_t odp_port,
+void ofproto_sflow_add_port(struct ofproto_sflow *, uint16_t xflow_port,
                             const char *netdev_name);
-void ofproto_sflow_del_port(struct ofproto_sflow *, uint16_t odp_port);
+void ofproto_sflow_del_port(struct ofproto_sflow *, uint16_t xflow_port);
 void ofproto_sflow_set_group_sizes(struct ofproto_sflow *,
                                    size_t n_flood, size_t n_all);
 
 void ofproto_sflow_run(struct ofproto_sflow *);
 void ofproto_sflow_wait(struct ofproto_sflow *);
 
-void ofproto_sflow_received(struct ofproto_sflow *, struct odp_msg *);
+void ofproto_sflow_received(struct ofproto_sflow *, struct xflow_msg *);
 
 #endif /* ofproto/ofproto-sflow.h */