diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-07 12:22:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-07 12:22:06 -0400 |
| commit | d16658206a3a9a1cbe2cc062bee9ea7e782293a5 (patch) | |
| tree | e7374985d7ec3bcfa77616ca449debfefa6849d9 /net/ipv6/Kconfig | |
| parent | 19952cc4f8f572493293a8caed27c4be89c5fc9d (diff) | |
| parent | b8dd6a223eb86d537c2c6d8d28916c1f0ba3ea3c (diff) | |
| download | linux-d16658206a3a9a1cbe2cc062bee9ea7e782293a5.tar.bz2 | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Pablo Neira Ayuso says:
====================
The following patchset contains Netfilter and IPVS updates for
your net-next tree, most relevantly they are:
* Add net namespace support to NFLOG, ULOG and ebt_ulog and NFQUEUE.
The LOG and ebt_log target has been also adapted, but they still
depend on the syslog netnamespace that seems to be missing, from
Gao Feng.
* Don't lose indications of congestion in IPv6 fragmentation handling,
from Hannes Frederic Sowa.i
* IPVS conversion to use RCU, including some code consolidation patches
and optimizations, also some from Julian Anastasov.
* cpu fanout support for NFQUEUE, from Holger Eitzenberger.
* Better error reporting to userspace when dropping packets from
all our _*_[xfrm|route]_me_harder functions, from Patrick McHardy.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/Kconfig')
0 files changed, 0 insertions, 0 deletions