projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
f2fs: introduce tracepoint for f2fs_rename()
[linux-2.6-microblaze.git]
/
net
/
openvswitch
/
conntrack.c
diff --git
a/net/openvswitch/conntrack.c
b/net/openvswitch/conntrack.c
index
0b9a785
..
3019a44
100644
(file)
--- a/
net/openvswitch/conntrack.c
+++ b/
net/openvswitch/conntrack.c
@@
-985,7
+985,7
@@
static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,
if (err)
return err;
- nf_conn_act_ct_ext_add(
ct
);
+ nf_conn_act_ct_ext_add(
skb, ct, ctinfo
);
} else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
labels_nonzero(&info->labels.mask)) {
err = ovs_ct_set_labels(ct, key, &info->labels.value,