Use magic ETH_ADDR_LEN instead of 6 for Ethernet address length.

[cascardo/ovs.git] / lib / ofp-parse.h

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 16398a1..789febf 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include "compiler.h"
 #include "openvswitch/types.h"
+#include "packets.h"
 
 struct flow;
 struct ofpbuf;
@@ -60,10 +61,6 @@ char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *,
                                        enum ofputil_protocol *usable_protocols)
     WARN_UNUSED_RESULT;
 
-char *parse_ofpacts(const char *, struct ofpbuf *ofpacts,
-                    enum ofputil_protocol *usable_protocols)
-    WARN_UNUSED_RESULT;
-
 char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s,
                            const struct simap *portno_names);
 
@@ -94,7 +91,7 @@ char *str_to_u16(const char *str, const char *name, uint16_t *valuep)
 char *str_to_u32(const char *str, uint32_t *valuep) WARN_UNUSED_RESULT;
 char *str_to_u64(const char *str, uint64_t *valuep) WARN_UNUSED_RESULT;
 char *str_to_be64(const char *str, ovs_be64 *valuep) WARN_UNUSED_RESULT;
-char *str_to_mac(const char *str, uint8_t mac[6]) WARN_UNUSED_RESULT;
+char *str_to_mac(const char *str, uint8_t mac[ETH_ADDR_LEN]) WARN_UNUSED_RESULT;
 char *str_to_ip(const char *str, ovs_be32 *ip) WARN_UNUSED_RESULT;
 
 #endif /* ofp-parse.h */