Merge "sflow" into "master".

No conflicts, but lib/dpif.c needed a few changes since struct dpif's
member "class" was renamed to "dpif_class" in master since sflow was
branched off.

1 files changed, 6 insertions, 0 deletions

diff --git a/ofproto/collectors.c b/ofproto/collectors.c
index f7cb1dbe..4589f329 100644
--- a/ofproto/collectors.c
+++ b/ofproto/collectors.c
@@ -121,3 +121,9 @@ collectors_send(const struct collectors *c, const void *payload, size_t n)
         }
     }
 }
+
+int
+collectors_count(const struct collectors *c)
+{
+    return c->n_fds;
+}