Combine dl_vlan and dl_vlan_pcp.
authorBen Pfaff <blp@nicira.com>
Thu, 1 Apr 2010 22:51:53 +0000 (15:51 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 1 Apr 2010 22:51:53 +0000 (15:51 -0700)
commit04c46f4ad03d05491b72f7b1ae6196b515c45901
treef03bacf6c7875d953d08f14e7829ee467834e341
parent97ee114c3d3116174813e4c74d4a2adb92874862
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.
12 files changed:
datapath/actions.c
datapath/datapath.c
datapath/flow.c
datapath/linux-2.6/Modules.mk
datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h [new file with mode: 0644]
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