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 /lib/flow.h | |
| 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 'lib/flow.h')
| -rw-r--r-- | lib/flow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/flow.h b/lib/flow.h index 7c3654b00..4c5fc03ba 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -96,7 +96,7 @@ struct flow { ovs_be32 nw_dst; /* IPv4 destination address. */ ovs_be32 ipv6_label; /* IPv6 flow label. */ union flow_in_port in_port; /* Input port.*/ - uint32_t skb_mark; /* Packet mark. */ + uint32_t pkt_mark; /* Packet mark. */ ovs_be32 mpls_lse; /* MPLS label stack entry. */ uint16_t mpls_depth; /* Depth of MPLS stack. */ ovs_be16 vlan_tci; /* If 802.1Q, TCI | VLAN_CFI; otherwise 0. */ |