summaryrefslogtreecommitdiff
path: root/net/openvswitch/actions.c
diff options
context:
space:
mode:
authorJoe Stringer <joestringer@nicira.com>2015-10-02 01:00:37 +0300
committerDavid S. Miller <davem@davemloft.net>2015-10-05 16:34:28 +0300
commit33db4125ec745426c3483d6817d8f7ea5324cd05 (patch)
treefebc52ca2f509ffc4abd4d731c3b37e808a56df7 /net/openvswitch/actions.c
parente9193d60d363e4dff75ff6d43a48f22be26d59c7 (diff)
downloadlinux-33db4125ec745426c3483d6817d8f7ea5324cd05.tar.xz
openvswitch: Rename LABEL->LABELS
Conntrack LABELS (plural) are exposed by conntrack; rename the OVS name for these to be consistent with conntrack. Fixes: c2ac667 "openvswitch: Allow matching on conntrack label" Signed-off-by: Joe Stringer <joestringer@nicira.com> 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 315f5330b6e5..e23a61cc3d5c 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -968,7 +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:
- case OVS_KEY_ATTR_CT_LABEL:
+ case OVS_KEY_ATTR_CT_LABELS:
err = -EINVAL;
break;
}