Ethernet types are 16 bit values.
This resolves a small problem in "Alternate approach to MPLS".
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
lib/flow.c | 4 ++--
lib/flow.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/flow.c b/lib/flow.c
index 2fef1b6..a972860 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -1105,7 +1105,7 @@ flow_count_common_mpls_labels(const struct flow *flow_a,
}
void
-flow_push_mpls(struct flow *flow, ovs_be32 mpls_eth_type,
+flow_push_mpls(struct flow *flow, ovs_be16 mpls_eth_type,
struct flow_wildcards *wc)
{
int n = flow_count_mpls_labels(flow);
@@ -1141,7 +1141,7 @@ flow_push_mpls(struct flow *flow, ovs_be32 mpls_eth_type,
}
bool
-flow_pop_mpls(struct flow *flow, ovs_be32 eth_type, struct flow_wildcards *wc)
+flow_pop_mpls(struct flow *flow, ovs_be16 eth_type, struct flow_wildcards *wc)
{
int n = flow_count_mpls_labels(flow);
int i;
diff --git a/lib/flow.h b/lib/flow.h
index 3ad7a2c..ee65b05 100644
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -198,9 +198,9 @@ void flow_set_vlan_pcp(struct flow *, uint8_t pcp);
int flow_count_mpls_labels(const struct flow *);
int flow_count_common_mpls_labels(const struct flow *flow_a,
const struct flow *flow_b);
-void flow_push_mpls(struct flow *, ovs_be32 mpls_eth_type,
+void flow_push_mpls(struct flow *, ovs_be16 mpls_eth_type,
struct flow_wildcards *);
-bool flow_pop_mpls(struct flow *, ovs_be32 eth_type, struct flow_wildcards *);
+bool flow_pop_mpls(struct flow *, ovs_be16 eth_type, struct flow_wildcards *);
void flow_set_mpls_label(struct flow *, int idx, ovs_be32 label);
void flow_set_mpls_ttl(struct flow *, int idx, uint8_t ttl);
void flow_set_mpls_tc(struct flow *, int idx, uint8_t tc);
--
1.8.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
