diff options
| author | Jesse Gross <jesse@nicira.com> | 2013-08-06 12:57:13 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-08-13 14:39:39 -0700 |
| commit | 1362e248d68a8b7de3e6ec3689245e4dc882292b (patch) | |
| tree | ff6cdb594031ec0e0e173d077728fa142b2605ca /ofproto/tunnel.c | |
| parent | 15d0658c6913092adfa9c0ce001ec21e94ff67ba (diff) | |
| download | openvswitch-1362e248d68a8b7de3e6ec3689245e4dc882292b.tar.gz | |
flow: Rename skb_mark to pkt_mark.
The skb_mark field is currently only available with the Linux datapath
and is only used internally. However, it is desirable to expose this
through OpenFlow and when it is exposed ideally it would not be system-
specific. In preparation for this, skb_mark is rename to pkt_mark in
internal data structures for consistency.
This does not rename the Linux interfaces because doing so would break
the API. It would not necessarily be desirable to do anyways since in
Linux-specific code it is clearer to use the actual name rather than a
generic one. This can lead to confusion in some places, however, because
we do not always strictly separate generic and platform dependent code
(one example is actions). This seems inevitable though at this point if
the lower and upper layers have different names (as they must given the
above requirements).
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'ofproto/tunnel.c')
| -rw-r--r-- | ofproto/tunnel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ofproto/tunnel.c b/ofproto/tunnel.c index c23e2d769..bcc90cab2 100644 --- a/ofproto/tunnel.c +++ b/ofproto/tunnel.c @@ -36,7 +36,7 @@ struct tnl_match { ovs_be32 ip_src; ovs_be32 ip_dst; odp_port_t odp_port; - uint32_t skb_mark; + uint32_t pkt_mark; bool in_key_flow; bool ip_src_flow; bool ip_dst_flow; @@ -101,7 +101,7 @@ tnl_port_add__(const struct ofport_dpif *ofport, const struct netdev *netdev, tnl_port->match.ip_dst = cfg->ip_dst; tnl_port->match.ip_src_flow = cfg->ip_src_flow; tnl_port->match.ip_dst_flow = cfg->ip_dst_flow; - tnl_port->match.skb_mark = cfg->ipsec ? IPSEC_MARK : 0; + tnl_port->match.pkt_mark = cfg->ipsec ? IPSEC_MARK : 0; tnl_port->match.in_key_flow = cfg->in_key_flow; tnl_port->match.odp_port = odp_port; @@ -213,7 +213,7 @@ tnl_port_receive(const struct flow *flow) OVS_EXCLUDED(rwlock) match.ip_src = flow->tunnel.ip_dst; match.ip_dst = flow->tunnel.ip_src; match.in_key = flow->tunnel.tun_id; - match.skb_mark = flow->skb_mark; + match.pkt_mark = flow->pkt_mark; ovs_rwlock_rdlock(&rwlock); tnl_port = tnl_find(&match); @@ -282,7 +282,7 @@ tnl_port_send(const struct ofport_dpif *ofport, struct flow *flow, if (!cfg->ip_dst_flow) { flow->tunnel.ip_dst = tnl_port->match.ip_dst; } - flow->skb_mark = tnl_port->match.skb_mark; + flow->pkt_mark = tnl_port->match.pkt_mark; if (!cfg->out_key_flow) { flow->tunnel.tun_id = cfg->out_key; @@ -444,7 +444,7 @@ tnl_match_fmt(const struct tnl_match *match, struct ds *ds) } ds_put_format(ds, ", dp port=%"PRIu32, match->odp_port); - ds_put_format(ds, ", skb mark=%"PRIu32, match->skb_mark); + ds_put_format(ds, ", pkt mark=%"PRIu32, match->pkt_mark); } static void |