projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: Use unsigned types for hooknum and pf vars
[deliverable/linux.git]
/
net
/
netfilter
/
nf_conntrack_expect.c
diff --git
a/net/netfilter/nf_conntrack_expect.c
b/net/netfilter/nf_conntrack_expect.c
index e31beeb33b2b10ca8e0bc6c43aedcbe4a1c8c990..990fa12f2ee503eab3524a2550dff6372e3a02c1 100644
(file)
--- a/
net/netfilter/nf_conntrack_expect.c
+++ b/
net/netfilter/nf_conntrack_expect.c
@@
-241,7
+241,7
@@
struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me)
EXPORT_SYMBOL_GPL(nf_ct_expect_alloc);
void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,
EXPORT_SYMBOL_GPL(nf_ct_expect_alloc);
void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,
-
in
t family,
+
u_int8_
t family,
const union nf_inet_addr *saddr,
const union nf_inet_addr *daddr,
u_int8_t proto, const __be16 *src, const __be16 *dst)
const union nf_inet_addr *saddr,
const union nf_inet_addr *daddr,
u_int8_t proto, const __be16 *src, const __be16 *dst)
@@
-587,10
+587,10
@@
int __init nf_conntrack_expect_init(void)
return 0;
err3:
return 0;
err3:
+ kmem_cache_destroy(nf_ct_expect_cachep);
+err2:
nf_ct_free_hashtable(nf_ct_expect_hash, nf_ct_expect_vmalloc,
nf_ct_expect_hsize);
nf_ct_free_hashtable(nf_ct_expect_hash, nf_ct_expect_vmalloc,
nf_ct_expect_hsize);
-err2:
- kmem_cache_destroy(nf_ct_expect_cachep);
err1:
return err;
}
err1:
return err;
}
This page took
0.023615 seconds
and
5
git commands to generate.