diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-08-26 21:31:49 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-27 21:40:43 +0300 |
| commit | 182e3042e15de759e81618d11fe4f62f5259d982 (patch) | |
| tree | b4b79ba4ac69efbbf7e49d99e0d8ce451ee1f43b /net/openvswitch/actions.c | |
| parent | 7f8a436eaa2c3ddd8e1ff2fbca267e6275085536 (diff) | |
| download | linux-182e3042e15de759e81618d11fe4f62f5259d982.tar.xz | |
openvswitch: Allow matching on conntrack mark
Allow matching and setting the ct_mark field. As with ct_state and
ct_zone, these fields are populated when the CT action is executed. To
write to this field, a value and mask can be specified as a nested
attribute under the CT action. This data is stored with the conntrack
entry, and is executed after the lookup occurs for the CT action. The
conntrack entry itself must be committed using the COMMIT flag in the CT
action flags for this change to persist.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index 72ca2c491b0a..9741d2c703df 100644 --- a/net/openvswitch/actions.c +++ b/net/openvswitch/actions.c @@ -968,6 +968,7 @@ static int execute_masked_set_action(struct sk_buff *skb, case OVS_KEY_ATTR_CT_STATE: case OVS_KEY_ATTR_CT_ZONE: + case OVS_KEY_ATTR_CT_MARK: err = -EINVAL; break; } |