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 <blp@nicira.com>
Acked-by: Simon Horman <horms@verge.net.au>

diff --git a/lib/classifier.c b/lib/classifier.c
index 33245aeab0c4613165b1dea9d12f102ad47e1088..42e200d0ad38226851d1425b063a5819cd9a9634 100644 (file)
--- 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 5ba3e10df435dfa569e6712d850c59456e3619a9..984f5d9805be09da8c98463b71a2bffb5e739aa9 100644 (file)
--- 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 0cec1c992d329f59d1b8ac1ebbafe16d00873085..315ca3650755ef1f2ae3edca17291c76888d3746 100644 (file)
--- 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 f5754431a3103d05f6789c7b8b711c49b6314b5b..27f3bca73ba128c543af5dee5b374ef9cff9f37a 100644 (file)
--- 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: