diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-06-18 22:11:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-18 22:11:39 -0700 |
| commit | bd081e4b0252c534c27642c9bd8a296ec1e03431 (patch) | |
| tree | 22aced0e24480c8f2c62b89934868e64bbc70baa /drivers/net | |
| parent | net: ethernet: et131x: use phy_ethtool_{get|set}_link_ksettings (diff) | |
| parent | ipv6: RFC 4884 partial support for SIT/GRE tunnels (diff) | |
| download | linux-dev-bd081e4b0252c534c27642c9bd8a296ec1e03431.tar.xz linux-dev-bd081e4b0252c534c27642c9bd8a296ec1e03431.zip | |
Merge branch 'ipv6-better-traceroute-sit-gre'
Eric Dumazet says:
====================
ipv6: better traceroute support in sit and gre
In commit ca15a078bd90 ("sit: generate icmpv6 error when receiving icmpv4
error"), Oussama Ghorbel added minimal support for SIT tunnels to
generate ICMPv6 messages when receiving ICMPv4 messages.
This patch series extends this to GRE tunnels.
It also adds support for ICMPV6_TIME_EXCEED.
Partial support for RFC 4884 is added, to forward ICMP Multi-part
extensions eventually found in the ICMPv4 message.
v2: replaced an overlapping memcpy() by memmove()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions