diff options
author | Joe Stringer | 2015-10-01 15:00:37 -0700 |
---|---|---|
committer | David S. Miller | 2015-10-05 06:34:28 -0700 |
commit | 33db4125ec745426c3483d6817d8f7ea5324cd05 (patch) | |
tree | febc52ca2f509ffc4abd4d731c3b37e808a56df7 /net/openvswitch/conntrack.h | |
parent | e9193d60d363e4dff75ff6d43a48f22be26d59c7 (diff) |
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/conntrack.h')
-rw-r--r-- | net/openvswitch/conntrack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/conntrack.h b/net/openvswitch/conntrack.h index 43f5dd7a5577..6bd603c6a031 100644 --- a/net/openvswitch/conntrack.h +++ b/net/openvswitch/conntrack.h @@ -72,7 +72,7 @@ static inline void ovs_ct_fill_key(const struct sk_buff *skb, key->ct.state = 0; key->ct.zone = 0; key->ct.mark = 0; - memset(&key->ct.label, 0, sizeof(key->ct.label)); + memset(&key->ct.labels, 0, sizeof(key->ct.labels)); } static inline int ovs_ct_put_key(const struct sw_flow_key *key, |