diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-18 15:17:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-18 15:17:37 -0400 |
| commit | 6dae82224855be851e875d7573581c90b1932ab9 (patch) | |
| tree | 18ba33d8ef93c7aed235df1521d76c2b7e2b8249 /drivers | |
| parent | 43c422eda99b894f18d1cca17bcd2401efaf7bd0 (diff) | |
| parent | 2ad5b9e4bd314fc685086b99e90e5de3bc59e26b (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso Says:
====================
The following patchset contains Netfilter/IPVS updates for your
net tree, they are:
* Fix incorrect hooks for SNAT and DNAT (bug introduced in recent IPv6
NAT changes), from Elison Niven.
* Fix xt_TEE (got broken with recent rt_gateway semantic change),
from Eric Dumazet.
* Fix custom conntrack timeout policy attachment for IPv6, from myself.
* Always initialize ip_vs_timeout_user in case that TCP or UDP protocols
is disabled, from Arnd Bergmann.
Note that I had to pull from your tree to obtain:
(c92b96553a80c1 ipv4: Add FLOWI_FLAG_KNOWN_NH)
which was required for the xt_TEE fix.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions