Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144314
b: refs/heads/master
c: 4b07066
h: refs/heads/master
v: v3
  • Loading branch information
Laszlo Attila Toth authored and Patrick McHardy committed Apr 24, 2009
1 parent c2aac02 commit c69f082
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ff482940f5aa2cdc3424c4a8ea94b9833b2af5f
refs/heads/master: 4b0706624930dc75c3b0d0df463d89759ef7de29
4 changes: 2 additions & 2 deletions trunk/net/netfilter/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ config NF_CT_NETLINK
help
This option enables support for a netlink-based userspace interface

endif # NF_CONNTRACK

# transparent proxy support
config NETFILTER_TPROXY
tristate "Transparent proxying support (EXPERIMENTAL)"
Expand All @@ -290,8 +292,6 @@ config NETFILTER_TPROXY

To compile it as a module, choose M here. If unsure, say N.

endif # NF_CONNTRACK

config NETFILTER_XTABLES
tristate "Netfilter Xtables support (required for ip_tables)"
default m if NETFILTER_ADVANCED=n
Expand Down

0 comments on commit c69f082

Please sign in to comment.