X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=include%2Fopenvswitch%2Fdatapath-protocol.h;h=b0e9dfbb3cf44988291f96435a2251c6918f1714;hb=700712e226b325f02421189f6fb52bff167876ce;hp=1aa8066cade4487a054abd885bf25540d31e8182;hpb=a01ef04ced0d3e04e7d5e5038ef76c861b5c1da3;p=openvswitch diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index 1aa8066c..b0e9dfbb 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -258,7 +258,7 @@ struct odp_flowvec { /* Action types. */ #define ODPAT_OUTPUT 0 /* Output to switch port. */ #define ODPAT_CONTROLLER 2 /* Send copy to controller. */ -#define ODPAT_SET_DL_TCI 3 /* Set the 802.1q VLAN VID and/or PCP. */ +#define ODPAT_SET_DL_TCI 3 /* Set the 802.1q TCI value. */ #define ODPAT_STRIP_VLAN 5 /* Strip the 802.1q header. */ #define ODPAT_SET_DL_SRC 6 /* Ethernet source address. */ #define ODPAT_SET_DL_DST 7 /* Ethernet destination address. */ @@ -295,10 +295,8 @@ struct odp_action_tunnel { /* Action structure for ODPAT_SET_DL_TCI. */ struct odp_action_dl_tci { uint16_t type; /* ODPAT_SET_DL_TCI. */ - ovs_be16 tci; /* New TCI. Bits not in mask must be zero. */ - ovs_be16 mask; /* 0x0fff to set VID, 0xe000 to set PCP, - * or 0xefff to set both. */ - uint16_t reserved; + ovs_be16 tci; /* New TCI. CFI bit must be zero. */ + uint32_t reserved; }; /* Action structure for ODPAT_SET_DL_SRC/DST. */