ovs-dpctl: Don't include include/openvswitch/tunnel.h

[openvswitch] / lib / bundle.h

diff --git a/lib/bundle.h b/lib/bundle.h
index a202ade494c39d9cf49bd3efdd67142337553a61..4c0dff5dcf0c2dcf2add796ea9574c31ce79a5e5 100644 (file)
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 Nicira Networks.
+/* Copyright (c) 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "ofp-errors.h"
 #include "openflow/nicira-ext.h"
 #include "openvswitch/types.h"
 
@@ -35,8 +36,13 @@ struct ofpbuf;
 uint16_t bundle_execute(const struct nx_action_bundle *, const struct flow *,
                         bool (*slave_enabled)(uint16_t ofp_port, void *aux),
                         void *aux);
-int bundle_check(const struct nx_action_bundle *, int max_ports);
+void bundle_execute_load(const struct nx_action_bundle *, struct flow *,
+                         bool (*slave_enabled)(uint16_t ofp_port, void *aux),
+                         void *aux);
+enum ofperr bundle_check(const struct nx_action_bundle *, int max_ports,
+                         const struct flow *);
 void bundle_parse(struct ofpbuf *, const char *);
+void bundle_parse_load(struct ofpbuf *b, const char *);
 void bundle_format(const struct nx_action_bundle *, struct ds *);
 
 /* Returns the 'i'th slave in 'nab'. */