flow: Rename skb_mark to pkt_mark.
authorJesse Gross <jesse@nicira.com>
Tue, 6 Aug 2013 19:57:13 +0000 (12:57 -0700)
committerJesse Gross <jesse@nicira.com>
Tue, 13 Aug 2013 21:39:39 +0000 (14:39 -0700)
commit1362e248d68a8b7de3e6ec3689245e4dc882292b
treeff6cdb594031ec0e0e173d077728fa142b2605ca
parent15d0658c6913092adfa9c0ce001ec21e94ff67ba
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>
18 files changed:
lib/dpif-netdev.c
lib/flow.c
lib/flow.h
lib/match.c
lib/match.h
lib/meta-flow.c
lib/meta-flow.h
lib/odp-execute.c
lib/odp-util.c
lib/odp-util.h
lib/ofp-util.c
ofproto/ofproto-dpif-upcall.c
ofproto/ofproto-dpif-xlate.c
ofproto/ofproto-dpif.c
ofproto/ofproto-unixctl.man
ofproto/tunnel.c
tests/ofproto-dpif.at
tests/ovs-ofctl.at