diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2009-02-24 01:21:16 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2009-02-24 01:21:16 +0000 |
| commit | 30c7c06aca35c9dd03c63be263f0ae5187460e8f (patch) | |
| tree | 8d92e98e447aecb25bb2cbaec12cc1a926a85663 /pfinet/linux-src/net/ipv6/icmpv6.c | |
| parent | 1834b60bc7555afc464186de564d760bcc644188 (diff) | |
| download | hurd-30c7c06aca35c9dd03c63be263f0ae5187460e8f.tar.gz hurd-30c7c06aca35c9dd03c63be263f0ae5187460e8f.tar.bz2 hurd-30c7c06aca35c9dd03c63be263f0ae5187460e8f.zip | |
2009-02-24 Samuel Thibault <samuel.thibault@ens-lyon.org>
* 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.
Diffstat (limited to 'pfinet/linux-src/net/ipv6/icmpv6.c')
| -rw-r--r-- | pfinet/linux-src/net/ipv6/icmpv6.c | 34 |
1 files changed, 17 insertions, 17 deletions
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 <roque@di.fc.ul.pt> * - * $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: |