diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 08:58:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 08:58:52 -0700 |
commit | b225ee5bed70254a100896c473e6dd8c2be45c18 (patch) | |
tree | 2f044d5898d15edcff858f624618c788d5b58760 /net/netfilter/nf_conntrack_netlink.c | |
parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
parent | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (diff) | |
download | op-kernel-dev-b225ee5bed70254a100896c473e6dd8c2be45c18.zip op-kernel-dev-b225ee5bed70254a100896c473e6dd8c2be45c18.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
ipv4: Add a missing rcu_assign_pointer() in routing cache.
[netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit
xen-netfront: Avoid unaligned accesses to IP header
lmc: copy_*_user under spinlock
[netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 08e82d6..2e4ad96 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -822,7 +822,7 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, parse_nat_setup = rcu_dereference(nfnetlink_parse_nat_setup_hook); if (!parse_nat_setup) { -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES rcu_read_unlock(); nfnl_unlock(); if (request_module("nf-nat-ipv4") < 0) { |