From fb0451d9bfbfb1d2803423c4491fe2d4da4cdc3a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 22 Jul 2012 22:42:55 -0700 Subject: [PATCH] flow: Rename flow_set_vlan_vid() to flow_set_dl_vlan(). This function is specific to the OF1.0 dl_vlan field, so name it consistently. Signed-off-by: Ben Pfaff Acked-by: Simon Horman --- lib/classifier.c | 2 +- lib/flow.c | 2 +- lib/flow.h | 2 +- lib/meta-flow.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/classifier.c b/lib/classifier.c index 33245aea..42e200d0 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -266,7 +266,7 @@ cls_rule_set_any_vid(struct cls_rule *rule) void cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) { - flow_set_vlan_vid(&rule->flow, dl_vlan); + flow_set_dl_vlan(&rule->flow, dl_vlan); if (dl_vlan == htons(OFP10_VLAN_NONE)) { rule->wc.vlan_tci_mask = htons(UINT16_MAX); } else { diff --git a/lib/flow.c b/lib/flow.c index 5ba3e10d..984f5d98 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -968,7 +968,7 @@ flow_hash_fields_valid(enum nx_hash_fields fields) * * - Other values of 'vid' should not be used. */ void -flow_set_vlan_vid(struct flow *flow, ovs_be16 vid) +flow_set_dl_vlan(struct flow *flow, ovs_be16 vid) { if (vid == htons(OFP10_VLAN_NONE)) { flow->vlan_tci = htons(0); diff --git a/lib/flow.h b/lib/flow.h index 0cec1c99..315ca365 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -117,7 +117,7 @@ static inline int flow_compare_3way(const struct flow *, const struct flow *); static inline bool flow_equal(const struct flow *, const struct flow *); static inline size_t flow_hash(const struct flow *, uint32_t basis); -void flow_set_vlan_vid(struct flow *, ovs_be16 vid); +void flow_set_dl_vlan(struct flow *, ovs_be16 vid); void flow_set_vlan_pcp(struct flow *, uint8_t pcp); void flow_compose(struct ofpbuf *, const struct flow *); diff --git a/lib/meta-flow.c b/lib/meta-flow.c index f5754431..27f3bca7 100644 --- a/lib/meta-flow.c +++ b/lib/meta-flow.c @@ -1218,7 +1218,7 @@ mf_set_flow_value(const struct mf_field *mf, break; case MFF_DL_VLAN: - flow_set_vlan_vid(flow, value->be16); + flow_set_dl_vlan(flow, value->be16); break; case MFF_DL_VLAN_PCP: -- 2.30.2