git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_standalone.c
diff --git
a/net/ipv4/netfilter/nf_nat_standalone.c
b/net/ipv4/netfilter/nf_nat_standalone.c
index
332814d
..
46cc99d
100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_standalone.c
+++ b/
net/ipv4/netfilter/nf_nat_standalone.c
@@
-328,7
+328,7
@@
static int __init nf_nat_standalone_init(void)
{
int ret = 0;
- need_conntrack();
+ need_
ipv4_
conntrack();
#ifdef CONFIG_XFRM
BUG_ON(ip_nat_decode_session != NULL);