UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

openvswitch: Fix conntrack compilation without mark. 

Fix build with !CONFIG_NF_CONNTRACK_MARK && CONFIG_OPENVSWITCH_CONNTRACK

Fixes: 182e304 ("openvswitch: Allow matching on conntrack mark")
Reported-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Tested-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Stringer 2015-08-28 19:22:11 -07:00 committed by David S. Miller
parent 581a5f2a61
commit 0d5cdef8d5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/openvswitch/conntrack.c
View File

@ -100,6 +100,15 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo)
return ct_state; return ct_state;
} }
static u32 ovs_ct_get_mark(const struct nf_conn *ct)
{
#if IS_ENABLED(CONFIG_NF_CONNTRACK_MARK)
return ct ? ct->mark : 0;
#else
return 0;
#endif
}
static void ovs_ct_get_label(const struct nf_conn *ct, static void ovs_ct_get_label(const struct nf_conn *ct,
struct ovs_key_ct_label *label) struct ovs_key_ct_label *label)
{ {
@ -124,7 +133,7 @@ static void __ovs_ct_update_key(struct sw_flow_key *key, u8 state,
{ {
key->ct.state = state; key->ct.state = state;
key->ct.zone = zone->id; key->ct.zone = zone->id;
key->ct.mark = ct ? ct->mark : 0; key->ct.mark = ovs_ct_get_mark(ct);
ovs_ct_get_label(ct, &key->ct.label); ovs_ct_get_label(ct, &key->ct.label);
} }
@ -180,12 +189,11 @@ int ovs_ct_put_key(const struct sw_flow_key *key, struct sk_buff *skb)
static int ovs_ct_set_mark(struct sk_buff *skb, struct sw_flow_key *key, static int ovs_ct_set_mark(struct sk_buff *skb, struct sw_flow_key *key,
u32 ct_mark, u32 mask) u32 ct_mark, u32 mask)
{ {
#if IS_ENABLED(CONFIG_NF_CONNTRACK_MARK)
enum ip_conntrack_info ctinfo; enum ip_conntrack_info ctinfo;
struct nf_conn *ct; struct nf_conn *ct;
u32 new_mark; u32 new_mark;
if (!IS_ENABLED(CONFIG_NF_CONNTRACK_MARK))
return -ENOTSUPP;
/* The connection could be invalid, in which case set_mark is no-op. */ /* The connection could be invalid, in which case set_mark is no-op. */
ct = nf_ct_get(skb, &ctinfo); ct = nf_ct_get(skb, &ctinfo);
@ -200,6 +208,9 @@ static int ovs_ct_set_mark(struct sk_buff *skb, struct sw_flow_key *key,
} }
return 0; return 0;
#else
return -ENOTSUPP;
#endif
} }
static int ovs_ct_set_label(struct sk_buff *skb, struct sw_flow_key *key, static int ovs_ct_set_label(struct sk_buff *skb, struct sw_flow_key *key,