Prepare for post-1.8.0 (1.8.90).

[openvswitch] / lib / odp-util.c

diff --git a/lib/odp-util.c b/lib/odp-util.c
index 13cdf8e58d5c07c3067d38f5082e6ecef2f7ac26..7caab09c5c3694ae4667ddd57ac29e011b9b1dac 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <arpa/inet.h>
 #include <config.h>
+#include <arpa/inet.h>
 #include "odp-util.h"
 #include <errno.h>
 #include <inttypes.h>
@@ -30,7 +30,6 @@
 #include "flow.h"
 #include "netlink.h"
 #include "ofpbuf.h"
-#include "openvswitch/tunnel.h"
 #include "packets.h"
 #include "simap.h"
 #include "timeval.h"
@@ -1247,7 +1246,10 @@ ovs_to_odp_frag(uint8_t nw_frag)
           : OVS_FRAG_TYPE_LATER);
 }
 
-/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'. */
+/* Appends a representation of 'flow' as OVS_KEY_ATTR_* attributes to 'buf'.
+ *
+ * 'buf' must have at least ODPUTIL_FLOW_KEY_BYTES bytes of space, or be
+ * capable of being expanded to allow for that much space. */
 void
 odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow)
 {