aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/sit.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r--net/ipv6/sit.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 18ec86f177d9..1e8827b90aa7 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -224,8 +224,8 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
224 ICMP in the real Internet is absolutely infeasible. 224 ICMP in the real Internet is absolutely infeasible.
225 */ 225 */
226 struct iphdr *iph = (struct iphdr*)skb->data; 226 struct iphdr *iph = (struct iphdr*)skb->data;
227 int type = skb->h.icmph->type; 227 const int type = icmp_hdr(skb)->type;
228 int code = skb->h.icmph->code; 228 const int code = icmp_hdr(skb)->code;
229 struct ip_tunnel *t; 229 struct ip_tunnel *t;
230 int err; 230 int err;
231 231
@@ -280,8 +280,8 @@ out:
280 struct iphdr *iph = (struct iphdr*)dp; 280 struct iphdr *iph = (struct iphdr*)dp;
281 int hlen = iph->ihl<<2; 281 int hlen = iph->ihl<<2;
282 struct ipv6hdr *iph6; 282 struct ipv6hdr *iph6;
283 int type = skb->h.icmph->type; 283 const int type = icmp_hdr(skb)->type;
284 int code = skb->h.icmph->code; 284 const int code = icmp_hdr(skb)->code;
285 int rel_type = 0; 285 int rel_type = 0;
286 int rel_code = 0; 286 int rel_code = 0;
287 int rel_info = 0; 287 int rel_info = 0;
@@ -296,14 +296,14 @@ out:
296 default: 296 default:
297 return; 297 return;
298 case ICMP_PARAMETERPROB: 298 case ICMP_PARAMETERPROB:
299 if (skb->h.icmph->un.gateway < hlen) 299 if (icmp_hdr(skb)->un.gateway < hlen)
300 return; 300 return;
301 301
302 /* So... This guy found something strange INSIDE encapsulated 302 /* So... This guy found something strange INSIDE encapsulated
303 packet. Well, he is fool, but what can we do ? 303 packet. Well, he is fool, but what can we do ?
304 */ 304 */
305 rel_type = ICMPV6_PARAMPROB; 305 rel_type = ICMPV6_PARAMPROB;
306 rel_info = skb->h.icmph->un.gateway - hlen; 306 rel_info = icmp_hdr(skb)->un.gateway - hlen;
307 break; 307 break;
308 308
309 case ICMP_DEST_UNREACH: 309 case ICMP_DEST_UNREACH: