diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/netfilter | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 8260b13d93c9..e8f379692294 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
| @@ -542,7 +542,6 @@ config NETFILTER_XT_TARGET_NOTRACK | |||
| 542 | tristate '"NOTRACK" target support' | 542 | tristate '"NOTRACK" target support' |
| 543 | depends on IP_NF_RAW || IP6_NF_RAW | 543 | depends on IP_NF_RAW || IP6_NF_RAW |
| 544 | depends on NF_CONNTRACK | 544 | depends on NF_CONNTRACK |
| 545 | depends on NETFILTER_ADVANCED | ||
| 546 | help | 545 | help |
| 547 | The NOTRACK target allows a select rule to specify | 546 | The NOTRACK target allows a select rule to specify |
| 548 | which packets *not* to enter the conntrack/NAT | 547 | which packets *not* to enter the conntrack/NAT |