ofp-util: Fix OF1.4+ version of ofputil_decode_set_async_config().

[cascardo/ovs.git] / lib / bundle.h

diff --git a/lib/bundle.h b/lib/bundle.h
index dceb6e5..a1f0ef2 100644 (file)
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012, 2013 Nicira, Inc.
+/* Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,18 +36,17 @@ struct ofpbuf;
  *
  * See include/openflow/nicira-ext.h for NXAST_BUNDLE specification. */
 
+#define BUNDLE_MAX_SLAVES 2048
+
 ofp_port_t bundle_execute(const struct ofpact_bundle *, const struct flow *,
                         struct flow_wildcards *wc,
                         bool (*slave_enabled)(ofp_port_t ofp_port, void *aux),
                         void *aux);
-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(const char *, struct ofpbuf *ofpacts) OVS_WARN_UNUSED_RESULT;
 char *bundle_parse_load(const char *, struct ofpbuf *ofpacts)
-    WARN_UNUSED_RESULT;
+    OVS_WARN_UNUSED_RESULT;
 void bundle_format(const struct ofpact_bundle *, struct ds *);
 
 #endif /* bundle.h */