-int bundle_check(const struct nx_action_bundle *, int max_ports);
-void bundle_parse(struct ofpbuf *, const char *);
-void bundle_format(const struct nx_action_bundle *, struct ds *);
-
-/* Returns the 'i'th slave in 'nab'. */
-static inline uint16_t
-bundle_get_slave(const struct nx_action_bundle *nab, size_t i)
-{
- return ntohs(((ovs_be16 *)(nab + 1))[i]);
-}
+enum ofperr bundle_from_openflow(const struct nx_action_bundle *,
+ struct ofpbuf *ofpact);
+enum ofperr bundle_check(const struct ofpact_bundle *, ofp_port_t max_ports,
+ const struct flow *);
+void bundle_to_nxast(const struct ofpact_bundle *, struct ofpbuf *of10);
+char *bundle_parse(const char *, struct ofpbuf *ofpacts) WARN_UNUSED_RESULT;
+char *bundle_parse_load(const char *, struct ofpbuf *ofpacts)
+ WARN_UNUSED_RESULT;
+void bundle_format(const struct ofpact_bundle *, struct ds *);