diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-10-01 15:00:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-05 06:34:28 -0700 |
| commit | 33db4125ec745426c3483d6817d8f7ea5324cd05 (patch) | |
| tree | febc52ca2f509ffc4abd4d731c3b37e808a56df7 /net/openvswitch/flow.h | |
| parent | e9193d60d363e4dff75ff6d43a48f22be26d59c7 (diff) | |
| download | op-kernel-dev-33db4125ec745426c3483d6817d8f7ea5324cd05.zip op-kernel-dev-33db4125ec745426c3483d6817d8f7ea5324cd05.tar.gz | |
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/flow.h')
| -rw-r--r-- | net/openvswitch/flow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index fe527d2..8cfa15a 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -116,7 +116,7 @@ struct sw_flow_key { u16 zone; u32 mark; u8 state; - struct ovs_key_ct_label label; + struct ovs_key_ct_labels labels; } ct; } __aligned(BITS_PER_LONG/8); /* Ensure that we can do comparisons as longs. */ |
