mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

flow: Rename 'priority' to 'skb_priority'.

Browse Source 
This priority's mean is completely different from the priority of an
OpenFlow rule, so it is confusing for it to have the same name.

We should be on the lookout for a less Linux-specific name, but this one
seems fine for now.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2011-12-21 15:52:23 -08:00
parent 88f20c5687
commit deedf7e78b
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/flow.c
View File

@@ -312,7 +312,9 @@ invalid:
}
/* Initializes 'flow' members from 'packet', 'tun_id', and 'ofp_in_port'.
/* Initializes 'flow' members from 'packet', 'skb_priority', 'tun_id', and
* 'ofp_in_port'.
*
* Initializes 'packet' header pointers as follows:
*
* - packet->l2 to the start of the Ethernet header.
@@ -328,7 +330,7 @@ invalid:
* present and has a correct length, and otherwise NULL.
*/
void
flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id,
flow_extract(struct ofpbuf *packet, uint32_t skb_priority, ovs_be64 tun_id,
uint16_t ofp_in_port, struct flow *flow)
{
struct ofpbuf b = *packet;
@@ -339,7 +341,7 @@ flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id,
memset(flow, 0, sizeof *flow);
flow->tun_id = tun_id;
flow->in_port = ofp_in_port;
flow->priority = priority;
flow->skb_priority = skb_priority;
packet->l2 = b.data;
packet->l3 = NULL;
@@ -502,7 +504,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards)
if (wc & FWW_ND_TARGET) {
memset(&flow->nd_target, 0, sizeof flow->nd_target);
}
flow->priority = 0;
flow->skb_priority = 0;
}
char *
@@ -519,7 +521,7 @@ flow_format(struct ds *ds, const struct flow *flow)
ds_put_format(ds, "priority%"PRIu32
":tunnel%#"PRIx64
":in_port%04"PRIx16,
flow->priority,
flow->skb_priority,
ntohll(flow->tun_id),
flow->in_port);