netdev
[Top] [All Lists]

[PATCH] IPV6: kill in6_u.u6_addrX

To: davem@xxxxxxxxxx
Subject: [PATCH] IPV6: kill in6_u.u6_addrX
From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>
Date: Thu, 12 Feb 2004 14:00:22 +0900 (JST)
Cc: netdev@xxxxxxxxxxx, yoshfuji@xxxxxxxxxxxxxx
Organization: USAGI Project
Sender: netdev-bounce@xxxxxxxxxxx
Hello.

There're still two in6_u.u6_addrX in the tree.
(I've grep'ed the tree.)

D: kill in6_u.u6_addrX and use s6_addrX instead.

Thanks.

===== net/ipv6/addrconf.c 1.91 vs edited =====
--- 1.91/net/ipv6/addrconf.c    Tue Feb  3 03:31:58 2004
+++ edited/net/ipv6/addrconf.c  Thu Feb 12 13:45:34 2004
@@ -231,7 +231,7 @@
 
        if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) {
                if (addr->s6_addr32[2] == 0) {
-                       if (addr->in6_u.u6_addr32[3] == 0)
+                       if (addr->s6_addr32[3] == 0)
                                return IPV6_ADDR_ANY;
 
                        if (addr->s6_addr32[3] == htonl(0x00000001))
===== net/ipv6/netfilter/ip6t_eui64.c 1.4 vs edited =====
--- 1.4/net/ipv6/netfilter/ip6t_eui64.c Thu Jan 29 08:59:34 2004
+++ edited/net/ipv6/netfilter/ip6t_eui64.c      Thu Feb 12 13:46:24 2004
@@ -50,7 +50,7 @@
         eui64[0] |= 0x02;
 
         i=0;
-        while ((skb->nh.ipv6h->saddr.in6_u.u6_addr8[8+i] ==
+        while ((skb->nh.ipv6h->saddr.s6_addr[8+i] ==
                         eui64[i]) && (i<8)) i++;
 
         if ( i == 8 )

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@xxxxxxxxxxxxxx>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA

<Prev in Thread] Current Thread [Next in Thread>