aboutsummaryrefslogtreecommitdiff
path: root/lib/meta-flow.h
diff options
context:
space:
mode:
authorJesse Gross <jesse@nicira.com>2013-08-06 12:57:13 -0700
committerJesse Gross <jesse@nicira.com>2013-08-13 14:39:39 -0700
commit1362e248d68a8b7de3e6ec3689245e4dc882292b (patch)
treeff6cdb594031ec0e0e173d077728fa142b2605ca /lib/meta-flow.h
parent15d0658c6913092adfa9c0ce001ec21e94ff67ba (diff)
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/meta-flow.h')
-rw-r--r--lib/meta-flow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index bc402dc0..93b894dc 100644
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -41,7 +41,7 @@ enum mf_field_id {
MFF_IN_PORT, /* be16 */
MFF_IN_PORT_OXM, /* be32 */
MFF_SKB_PRIORITY, /* be32 */
- MFF_SKB_MARK, /* be32 */
+ MFF_PKT_MARK, /* be32 */
#if FLOW_N_REGS > 0
MFF_REG0, /* be32 */