datapath: Combine dl_vlan and dl_vlan_pcp.
authorBen Pfaff <blp@nicira.com>
Fri, 8 Oct 2010 23:26:21 +0000 (16:26 -0700)
committerBen Pfaff <blp@nicira.com>
Mon, 11 Oct 2010 20:31:43 +0000 (13:31 -0700)
commit26233bb4615608fd45d89a5abe2e62f4b3d776f7
tree932157370b68fec5b6b775d70ccaa005c5b82362
parentae412e7dd89489911a32c6723d4109c6d1de3a38
datapath: Combine dl_vlan and dl_vlan_pcp.

This allows eliminating padding from odp_flow_key, although actually doing
that is postponed until the next commit.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
datapath/actions.c
datapath/datapath.c
datapath/flow.c
datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
include/openvswitch/datapath-protocol.h
lib/dpif-netdev.c
lib/odp-util.c
lib/packets.h
ofproto/ofproto-sflow.c
ofproto/ofproto.c
vswitchd/bridge.c