git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
[sfrench/cifs-2.6.git]
/
net
/
netfilter
/
nf_conntrack_core.c
diff --git
a/net/netfilter/nf_conntrack_core.c
b/net/netfilter/nf_conntrack_core.c
index f475fec84536a3e7bf61b771fa5a6a7a9f06288e..f4c4b467c87e9abf55b84cf0fae3948836b18afe 100644
(file)
--- a/
net/netfilter/nf_conntrack_core.c
+++ b/
net/netfilter/nf_conntrack_core.c
@@
-2334,7
+2334,6
@@
int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp)
return nf_conntrack_hash_resize(hashsize);
}
-EXPORT_SYMBOL_GPL(nf_conntrack_set_hashsize);
static __always_inline unsigned int total_extension_size(void)
{