diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-08-25 12:20:54 -0700 |
| commit | 4f9bfdcaca2414c8959986f0a4d73f16cb15e1c4 (patch) | |
| tree | 540bab5498d276cbbfad24c48a7ff989ee8b920a /libc/kernel/uapi/linux/openvswitch.h | |
| parent | bfda022dd6fbbcea60e9f52496d90ece514b32da (diff) | |
| parent | f77cc9b224c35fa7d1d71e7c374ef19e47b5f6a5 (diff) | |
Merge RP1A.190822.001
Change-Id: Iaf90835a99d87f6246798efd2cea6fe9f750ea18
Diffstat (limited to 'libc/kernel/uapi/linux/openvswitch.h')
| -rw-r--r-- | libc/kernel/uapi/linux/openvswitch.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libc/kernel/uapi/linux/openvswitch.h b/libc/kernel/uapi/linux/openvswitch.h index 7e75ac6f6..2344ab19e 100644 --- a/libc/kernel/uapi/linux/openvswitch.h +++ b/libc/kernel/uapi/linux/openvswitch.h @@ -205,6 +205,7 @@ enum ovs_tunnel_key_attr { OVS_TUNNEL_KEY_ATTR_IPV6_DST, OVS_TUNNEL_KEY_ATTR_PAD, OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, + OVS_TUNNEL_KEY_ATTR_IPV4_INFO_BRIDGE, __OVS_TUNNEL_KEY_ATTR_MAX }; #define OVS_TUNNEL_KEY_ATTR_MAX (__OVS_TUNNEL_KEY_ATTR_MAX - 1) @@ -384,6 +385,7 @@ enum ovs_ct_attr { OVS_CT_ATTR_NAT, OVS_CT_ATTR_FORCE_COMMIT, OVS_CT_ATTR_EVENTMASK, + OVS_CT_ATTR_TIMEOUT, __OVS_CT_ATTR_MAX }; #define OVS_CT_ATTR_MAX (__OVS_CT_ATTR_MAX - 1) @@ -404,6 +406,14 @@ enum ovs_nat_attr { struct ovs_action_push_eth { struct ovs_key_ethernet addresses; }; +enum ovs_check_pkt_len_attr { + OVS_CHECK_PKT_LEN_ATTR_UNSPEC, + OVS_CHECK_PKT_LEN_ATTR_PKT_LEN, + OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_GREATER, + OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL, + __OVS_CHECK_PKT_LEN_ATTR_MAX, +}; +#define OVS_CHECK_PKT_LEN_ATTR_MAX (__OVS_CHECK_PKT_LEN_ATTR_MAX - 1) enum ovs_action_attr { OVS_ACTION_ATTR_UNSPEC, OVS_ACTION_ATTR_OUTPUT, @@ -426,6 +436,7 @@ enum ovs_action_attr { OVS_ACTION_ATTR_POP_NSH, OVS_ACTION_ATTR_METER, OVS_ACTION_ATTR_CLONE, + OVS_ACTION_ATTR_CHECK_PKT_LEN, __OVS_ACTION_ATTR_MAX, }; #define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1) |