diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-03 03:43:04 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-03 03:43:04 +0400 |
| commit | ae8694fa8a2c7846c6208e9f4c03dde6323c08eb (patch) | |
| tree | bfccb09bcb5a44c5aaf213b492cd2ff77c4005b0 /net/batman-adv | |
| parent | 166bd890a3d851b7cfdf3e417917878bfe4671f1 (diff) | |
| parent | 0dc1362562a2e8b82a6be8d3ae307a234f28f9bc (diff) | |
| download | linux-ae8694fa8a2c7846c6208e9f4c03dde6323c08eb.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter/IPVS fixes for net
The following patchset contains Netfilter/IPVS fixes for your net tree,
they are:
1) Maintain all DSCP and ECN bits for IPv6 tun forwarding. This
resolves an inconsistency between IPv4 and IPv6 behaviour.
Patch from Alex Gartrell via Simon Horman.
2) Fix unnoticeable blink in xt_LED when the led-always-blink option is
used, from Jiri Prchal.
3) Add missing return in nft_del_setelem(), otherwise this results in a
double call of nft_data_uninit() in the nf_tables code, from Thomas Graf.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions