From 30c7c06aca35c9dd03c63be263f0ae5187460e8f Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 24 Feb 2009 01:21:16 +0000 Subject: 2009-02-24 Samuel Thibault * linux-src/net/ipv6/addrconf.c (ipv6_addr_type): Use __in6_u.__u6_addr32 member instead of in6_u.u6_addr32. * linux-src/net/ipv6/icmpv6.c (icmpv6_rcv): Use __in6_u.__u6_addr16 member instead of in6_u.u6_addr16. --- pfinet/linux-src/net/ipv6/icmpv6.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'pfinet/linux-src/net/ipv6/icmpv6.c') diff --git a/pfinet/linux-src/net/ipv6/icmpv6.c b/pfinet/linux-src/net/ipv6/icmpv6.c index 62dd149f..f7bebe0a 100644 --- a/pfinet/linux-src/net/ipv6/icmpv6.c +++ b/pfinet/linux-src/net/ipv6/icmpv6.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque * - * $Id: icmpv6.c,v 1.2 2007/10/08 21:59:10 stesie Exp $ + * $Id: icmpv6.c,v 1.3 2009/02/24 01:21:16 sthibaul Exp $ * * Based on net/ipv4/icmp.c * @@ -479,22 +479,22 @@ int icmpv6_rcv(struct sk_buff *skb, unsigned long len) if (csum_ipv6_magic(saddr, daddr, len, IPPROTO_ICMPV6, skb->csum)) { printk(KERN_DEBUG "ICMPv6 checksum failed [%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x > %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]\n", - ntohs(saddr->in6_u.u6_addr16[0]), - ntohs(saddr->in6_u.u6_addr16[1]), - ntohs(saddr->in6_u.u6_addr16[2]), - ntohs(saddr->in6_u.u6_addr16[3]), - ntohs(saddr->in6_u.u6_addr16[4]), - ntohs(saddr->in6_u.u6_addr16[5]), - ntohs(saddr->in6_u.u6_addr16[6]), - ntohs(saddr->in6_u.u6_addr16[7]), - ntohs(daddr->in6_u.u6_addr16[0]), - ntohs(daddr->in6_u.u6_addr16[1]), - ntohs(daddr->in6_u.u6_addr16[2]), - ntohs(daddr->in6_u.u6_addr16[3]), - ntohs(daddr->in6_u.u6_addr16[4]), - ntohs(daddr->in6_u.u6_addr16[5]), - ntohs(daddr->in6_u.u6_addr16[6]), - ntohs(daddr->in6_u.u6_addr16[7])); + ntohs(saddr->__in6_u.__u6_addr16[0]), + ntohs(saddr->__in6_u.__u6_addr16[1]), + ntohs(saddr->__in6_u.__u6_addr16[2]), + ntohs(saddr->__in6_u.__u6_addr16[3]), + ntohs(saddr->__in6_u.__u6_addr16[4]), + ntohs(saddr->__in6_u.__u6_addr16[5]), + ntohs(saddr->__in6_u.__u6_addr16[6]), + ntohs(saddr->__in6_u.__u6_addr16[7]), + ntohs(daddr->__in6_u.__u6_addr16[0]), + ntohs(daddr->__in6_u.__u6_addr16[1]), + ntohs(daddr->__in6_u.__u6_addr16[2]), + ntohs(daddr->__in6_u.__u6_addr16[3]), + ntohs(daddr->__in6_u.__u6_addr16[4]), + ntohs(daddr->__in6_u.__u6_addr16[5]), + ntohs(daddr->__in6_u.__u6_addr16[6]), + ntohs(daddr->__in6_u.__u6_addr16[7])); goto discard_it; } default: -- cgit v1.2.3