projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: nf_conntrack_expect: maintain per conntrack expectation list
[powerpc.git]
/
net
/
netfilter
/
nf_conntrack_netlink.c
diff --git
a/net/netfilter/nf_conntrack_netlink.c
b/net/netfilter/nf_conntrack_netlink.c
index
60af9b6
..
6f89b10
100644
(file)
--- a/
net/netfilter/nf_conntrack_netlink.c
+++ b/
net/netfilter/nf_conntrack_netlink.c
@@
-868,7
+868,7
@@
ctnetlink_change_helper(struct nf_conn *ct, struct nfattr *cda[])
/* need to zero data of old helper */
memset(&help->help, 0, sizeof(help->help));
} else {
/* need to zero data of old helper */
memset(&help->help, 0, sizeof(help->help));
} else {
- help = nf_ct_
ext_add(ct, NF_CT_EXT_HELPER
, GFP_KERNEL);
+ help = nf_ct_
helper_ext_add(ct
, GFP_KERNEL);
if (help == NULL)
return -ENOMEM;
}
if (help == NULL)
return -ENOMEM;
}
@@
-989,7
+989,7
@@
ctnetlink_create_conntrack(struct nfattr *cda[],
helper = nf_ct_helper_find_get(rtuple);
if (helper) {
helper = nf_ct_helper_find_get(rtuple);
if (helper) {
- help = nf_ct_
ext_add(ct, NF_CT_EXT_HELPER
, GFP_KERNEL);
+ help = nf_ct_
helper_ext_add(ct
, GFP_KERNEL);
if (help == NULL) {
nf_ct_helper_put(helper);
err = -ENOMEM;
if (help == NULL) {
nf_ct_helper_put(helper);
err = -ENOMEM;