diff options
| author |   Hannes Frederic Sowa <hannes@stressinduktion.org> | 2014-01-11 11:55:46 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-01-14 15:08:52 -0800 |
| commit | 825edac4e78ded9e621c167a4f47a2392bd9e082 (patch) | |
| tree | cc953c1f938bd18f472cebe557d21eca5ec5a084 /net/ipv6/icmp.c | |
| parent | ipv4: register igmp_notifier even when !CONFIG_PROC_FS (diff) | |
| download | linux-dev-825edac4e78ded9e621c167a4f47a2392bd9e082.tar.xz linux-dev-825edac4e78ded9e621c167a4f47a2392bd9e082.zip | |
ipv6: copy traffic class from ping request to reply
Suggested-by: Simon Schneider <simon-schneider@gmx.net>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 9a809a4b3d86..8003b4930267 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -67,6 +67,7 @@ #include <net/icmp.h> #include <net/xfrm.h> #include <net/inet_common.h> +#include <net/dsfield.h> #include <asm/uaccess.h> @@ -553,6 +554,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) struct dst_entry *dst; int err = 0; int hlimit; + u8 tclass; saddr = &ipv6_hdr(skb)->daddr; @@ -603,8 +605,9 @@ static void icmpv6_echo_reply(struct sk_buff *skb) msg.offset = 0; msg.type = ICMPV6_ECHO_REPLY; + tclass = ipv6_get_dsfield(ipv6_hdr(skb)); err = ip6_append_data(sk, icmpv6_getfrag, &msg, skb->len + sizeof(struct icmp6hdr), - sizeof(struct icmp6hdr), hlimit, np->tclass, NULL, &fl6, + sizeof(struct icmp6hdr), hlimit, tclass, NULL, &fl6, (struct rt6_info *)dst, MSG_DONTWAIT, np->dontfrag); |