diff options
Diffstat (limited to 'include/uapi/linux/openvswitch.h')
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 55f599792673..7a185b554343 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h | |||
| @@ -325,6 +325,7 @@ enum ovs_key_attr { | |||
| 325 | * the accepted length of the array. */ | 325 | * the accepted length of the array. */ |
| 326 | OVS_KEY_ATTR_CT_STATE, /* u8 bitmask of OVS_CS_F_* */ | 326 | OVS_KEY_ATTR_CT_STATE, /* u8 bitmask of OVS_CS_F_* */ |
| 327 | OVS_KEY_ATTR_CT_ZONE, /* u16 connection tracking zone. */ | 327 | OVS_KEY_ATTR_CT_ZONE, /* u16 connection tracking zone. */ |
| 328 | OVS_KEY_ATTR_CT_MARK, /* u32 connection tracking mark */ | ||
| 328 | 329 | ||
| 329 | #ifdef __KERNEL__ | 330 | #ifdef __KERNEL__ |
| 330 | OVS_KEY_ATTR_TUNNEL_INFO, /* struct ip_tunnel_info */ | 331 | OVS_KEY_ATTR_TUNNEL_INFO, /* struct ip_tunnel_info */ |
| @@ -613,11 +614,15 @@ struct ovs_action_hash { | |||
| 613 | * enum ovs_ct_attr - Attributes for %OVS_ACTION_ATTR_CT action. | 614 | * enum ovs_ct_attr - Attributes for %OVS_ACTION_ATTR_CT action. |
| 614 | * @OVS_CT_ATTR_FLAGS: u32 connection tracking flags. | 615 | * @OVS_CT_ATTR_FLAGS: u32 connection tracking flags. |
| 615 | * @OVS_CT_ATTR_ZONE: u16 connection tracking zone. | 616 | * @OVS_CT_ATTR_ZONE: u16 connection tracking zone. |
| 617 | * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the | ||
| 618 | * mask, the corresponding bit in the value is copied to the connection | ||
| 619 | * tracking mark field in the connection. | ||
| 616 | */ | 620 | */ |
| 617 | enum ovs_ct_attr { | 621 | enum ovs_ct_attr { |
| 618 | OVS_CT_ATTR_UNSPEC, | 622 | OVS_CT_ATTR_UNSPEC, |
| 619 | OVS_CT_ATTR_FLAGS, /* u8 bitmask of OVS_CT_F_*. */ | 623 | OVS_CT_ATTR_FLAGS, /* u8 bitmask of OVS_CT_F_*. */ |
| 620 | OVS_CT_ATTR_ZONE, /* u16 zone id. */ | 624 | OVS_CT_ATTR_ZONE, /* u16 zone id. */ |
| 625 | OVS_CT_ATTR_MARK, /* mark to associate with this connection. */ | ||
| 621 | __OVS_CT_ATTR_MAX | 626 | __OVS_CT_ATTR_MAX |
| 622 | }; | 627 | }; |
| 623 | 628 | ||
