diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /net/ipv6/icmp.c | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipv6/icmp.c')
| -rw-r--r-- | net/ipv6/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 3d6e9a351150..356a8a7ef22a 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
| @@ -401,7 +401,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info, | |||
| 401 | if (hlimit < 0) | 401 | if (hlimit < 0) |
| 402 | hlimit = ipv6_get_hoplimit(dst->dev); | 402 | hlimit = ipv6_get_hoplimit(dst->dev); |
| 403 | 403 | ||
| 404 | tclass = np->cork.tclass; | 404 | tclass = np->tclass; |
| 405 | if (tclass < 0) | 405 | if (tclass < 0) |
| 406 | tclass = 0; | 406 | tclass = 0; |
| 407 | 407 | ||
| @@ -497,7 +497,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) | |||
| 497 | if (hlimit < 0) | 497 | if (hlimit < 0) |
| 498 | hlimit = ipv6_get_hoplimit(dst->dev); | 498 | hlimit = ipv6_get_hoplimit(dst->dev); |
| 499 | 499 | ||
| 500 | tclass = np->cork.tclass; | 500 | tclass = np->tclass; |
| 501 | if (tclass < 0) | 501 | if (tclass < 0) |
| 502 | tclass = 0; | 502 | tclass = 0; |
| 503 | 503 | ||