testsuite: Add timeout to add_of_br() command.

[cascardo/ovs.git] / lib / meta-flow.h

diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index 95090fe..cb4e22d 100644 (file)
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -747,16 +747,16 @@ enum OVS_PACKED_ENUM mf_field_id {
      *   - Established (0x02): This is part of an already existing connection.
      *   - Related (0x04): This is a separate connection that is related to an
      *                     existing connection.
-     *   - Invalid (0x20): This flow could not be associated with a connection.
+     *   - Reply (0x08): This flow is in the reply direction, ie it did not
+     *                   initiate the connection.
+     *   - Invalid (0x10): This flow could not be associated with a connection.
      *                     This could be set for a variety of reasons,
      *                     including (but not limited to):
      *                     - L3/L4 protocol handler is not loaded/unavailable.
      *                     - L3/L4 protocol handler determines that the packet
      *                       is malformed or invalid for the current FSM stage.
      *                     - Packets are unexpected length for protocol.
-     *   - Reply (0x40): This flow is in the reply direction, ie it did not
-     *                   initiate the connection.
-     *   - Tracked (0x80): Connection tracking has occurred.
+     *   - Tracked (0x20): Connection tracking has occurred.
      *
      * The "Tracked" bit corresponds to the packet_state as described in the
      * description of NXAST_CT action. The remaining bits correspond to
@@ -1940,6 +1940,7 @@ bool mf_subvalue_intersect(const union mf_subvalue *a_value,
                            union mf_subvalue *dst_mask);
 int mf_subvalue_width(const union mf_subvalue *);
 void mf_subvalue_shift(union mf_subvalue *, int n);
+void mf_subvalue_format(const union mf_subvalue *, struct ds *);
 
 /* An array of fields with values */
 struct field_array {