From: Ben Pfaff Date: Wed, 21 Mar 2012 16:03:46 +0000 (-0700) Subject: ofproto-dpif: Fix return type of rule_calculate_tag(). X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822d941452da65dd067ab1fe19a7fc8f181558b5;p=openvswitch ofproto-dpif: Fix return type of rule_calculate_tag(). tag_type is currently uint32_t but using uint32_t directly is conceptually wrong. Signed-off-by: Ben Pfaff --- diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 642e3b0f..200846b7 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -109,7 +109,7 @@ static void flow_push_stats(struct rule_dpif *, const struct flow *, uint64_t packets, uint64_t bytes, long long int used); -static uint32_t rule_calculate_tag(const struct flow *, +static tag_type rule_calculate_tag(const struct flow *, const struct flow_wildcards *, uint32_t basis); static void rule_invalidate(const struct rule_dpif *); @@ -5694,7 +5694,7 @@ xlate_normal(struct action_xlate_ctx *ctx) /* Calculates the tag to use for 'flow' and wildcards 'wc' when it is inserted * into an OpenFlow table with the given 'basis'. */ -static uint32_t +static tag_type rule_calculate_tag(const struct flow *flow, const struct flow_wildcards *wc, uint32_t secret) {