2015-08-28 08:40:08

by Valentin Rothberg

Subject: [PATCH] openswitch: fix typo CONFIG_NF_CONNTRACK_LABEL

Fix typo in conntrack.c
s/CONFIG_NF_CONNTRACK_LABEL/CONFIG_NF_CONNTRACK_LABELS/

Signed-off-by: Valentin Rothberg <[email protected]>
---
The typo was added by commmit c2ac66735870 ("openvswitch: Allow matching
on conntrack label").
I detected the issue scripts/checkkconfigsymbols.py


net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 890d3eedb447..886bd2758502 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -169,7 +169,7 @@ int ovs_ct_put_key(const struct sw_flow_key *key, struct sk_buff *skb)
nla_put_u32(skb, OVS_KEY_ATTR_CT_MARK, key->ct.mark))
return -EMSGSIZE;

- if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABEL) &&
+ if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
nla_put(skb, OVS_KEY_ATTR_CT_LABEL, sizeof(key->ct.label),
&key->ct.label))
return -EMSGSIZE;
--
1.9.1

2015-08-28 20:40:23

by David Miller

Subject: Re: [PATCH] openswitch: fix typo CONFIG_NF_CONNTRACK_LABEL

From: Valentin Rothberg <[email protected]>
Date: Fri, 28 Aug 2015 10:39:56 +0200

> Fix typo in conntrack.c
> s/CONFIG_NF_CONNTRACK_LABEL/CONFIG_NF_CONNTRACK_LABELS/
>
> Signed-off-by: Valentin Rothberg <[email protected]>
> ---
> The typo was added by commmit c2ac66735870 ("openvswitch: Allow matching
> on conntrack label").
> I detected the issue scripts/checkkconfigsymbols.py

Applied, thank you.