aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 18:46:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 18:46:17 -0400
commit529a41e36673b518c9e091f3a8d932b6b9e3c461 (patch)
tree12416411590cb5d2b7f365f3800e31306909d6ce /net/ipv4
parentc3823c479e1f86a0adc7bb76fcfded67b042afc3 (diff)
parent43837b1e6c5aef803d57009a68db18df13e64892 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: rose: Socket lock was not released before returning to user space hci_usb: remove code obfuscation drivers/net/appletalk: use time_before, time_before_eq, etc drivers/atm: use time_before, time_before_eq, etc hci_usb: do not initialize static variables to 0 tg3: 5701 DMA corruption fix atm nicstar: Removal of debug code containing deprecated calls to cli()/sti() iwlwifi: Fix unconditional access to station->tidp[].agg. netfilter: Fix SIP conntrack build with NAT disabled. netfilter: Fix SCTP nat build.
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 0c95cd5872f3..2767841a8cef 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -259,6 +259,7 @@ config NF_NAT_PROTO_SCTP
259 tristate 259 tristate
260 default NF_NAT && NF_CT_PROTO_SCTP 260 default NF_NAT && NF_CT_PROTO_SCTP
261 depends on NF_NAT && NF_CT_PROTO_SCTP 261 depends on NF_NAT && NF_CT_PROTO_SCTP
262 select LIBCRC32C
262 263
263config NF_NAT_FTP 264config NF_NAT_FTP
264 tristate 265 tristate