diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-08 18:40:21 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-08 18:40:21 (GMT) |
| commit | 9bb862beb6e5839e92f709d33fda07678f062f20 (patch) | |
| tree | a2c396712c5a2cda380034173fd07a67bfa0489f /Documentation | |
| parent | b44907e64cc1987153f6577306108379be1523b7 (diff) | |
| parent | d16cf20e2f2f13411eece7f7fb72c17d141c4a84 (diff) | |
| download | linux-9bb862beb6e5839e92f709d33fda07678f062f20.tar.xz | |
Merge branch 'master' of git://1984.lsi.us.es/net-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/removed/ip_queue | 9 | ||||
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/Documentation/ABI/removed/ip_queue b/Documentation/ABI/removed/ip_queue new file mode 100644 index 0000000..3243613 --- /dev/null +++ b/Documentation/ABI/removed/ip_queue @@ -0,0 +1,9 @@ +What: ip_queue +Date: finally removed in kernel v3.5.0 +Contact: Pablo Neira Ayuso <pablo@netfilter.org> +Description: + ip_queue has been replaced by nfnetlink_queue which provides + more advanced queueing mechanism to user-space. The ip_queue + module was already announced to become obsolete years ago. + +Users: diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 90b0c4f..6f896b9 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1301,13 +1301,22 @@ bridge-nf-call-ip6tables - BOOLEAN bridge-nf-filter-vlan-tagged - BOOLEAN 1 : pass bridged vlan-tagged ARP/IP/IPv6 traffic to {arp,ip,ip6}tables. 0 : disable this. - Default: 1 + Default: 0 bridge-nf-filter-pppoe-tagged - BOOLEAN 1 : pass bridged pppoe-tagged IP/IPv6 traffic to {ip,ip6}tables. 0 : disable this. - Default: 1 + Default: 0 +bridge-nf-pass-vlan-input-dev - BOOLEAN + 1: if bridge-nf-filter-vlan-tagged is enabled, try to find a vlan + interface on the bridge and set the netfilter input device to the vlan. + This allows use of e.g. "iptables -i br0.1" and makes the REDIRECT + target work with vlan-on-top-of-bridge interfaces. When no matching + vlan interface is found, or this switch is off, the input device is + set to the bridge interface. + 0: disable bridge netfilter vlan interface lookup. + Default: 0 proc/sys/net/sctp/* Variables: |