* [PATCH 1/3] IPV6: clean-up DAD vs tentative address
@ 2004-02-06 9:10 YOSHIFUJI Hideaki / 吉藤英明
2004-02-06 23:30 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2004-02-06 9:10 UTC (permalink / raw)
To: davem; +Cc: yoshfuji, netdev
Hello.
[PATCH 1/3] IPV6: clean-up DAD vs tentative address
D: clean-up NS (including DAD) vs tentative address
Thanks.
===== net/ipv6/ndisc.c 1.67 vs edited =====
--- 1.67/net/ipv6/ndisc.c Wed Feb 4 02:13:51 2004
+++ edited/net/ipv6/ndisc.c Fri Feb 6 15:10:20 2004
@@ -764,23 +764,24 @@
does DAD, otherwise we ignore solicitations
until DAD timer expires.
*/
- if (addr_type == IPV6_ADDR_ANY) {
- if (dev->type == ARPHRD_IEEE802_TR) {
- unsigned char *sadr = skb->mac.raw ;
- if (((sadr[8] &0x7f) != (dev->dev_addr[0] & 0x7f)) ||
- (sadr[9] != dev->dev_addr[1]) ||
- (sadr[10] != dev->dev_addr[2]) ||
- (sadr[11] != dev->dev_addr[3]) ||
- (sadr[12] != dev->dev_addr[4]) ||
- (sadr[13] != dev->dev_addr[5]))
- {
- addrconf_dad_failure(ifp) ;
- }
- } else {
- addrconf_dad_failure(ifp);
- }
- } else
+ if (addr_type != IPV6_ADDR_ANY) {
in6_ifa_put(ifp);
+ return;
+ }
+ if (dev->type == ARPHRD_IEEE802_TR) {
+ unsigned char *sadr = skb->mac.raw;
+ if (((sadr[8] ^ dev->dev_addr[0]) & 0x7f) == 0 &&
+ sadr[9] == dev->dev_addr[1] &&
+ sadr[10] == dev->dev_addr[2] &&
+ sadr[11] == dev->dev_addr[3] &&
+ sadr[12] == dev->dev_addr[4] &&
+ sadr[13] == dev->dev_addr[5]) {
+ /* looped-back to us */
+ in6_ifa_put(ifp);
+ return;
+ }
+ }
+ addrconf_dad_failure(ifp);
return;
}
--
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] IPV6: clean-up DAD vs tentative address
2004-02-06 9:10 [PATCH 1/3] IPV6: clean-up DAD vs tentative address YOSHIFUJI Hideaki / 吉藤英明
@ 2004-02-06 23:30 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2004-02-06 23:30 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
On Fri, 06 Feb 2004 18:10:03 +0900 (JST)
YOSHIFUJI Hideaki / ^[$B5HF#1QL@^[(B <yoshfuji@linux-ipv6.org> wrote:
> [PATCH 1/3] IPV6: clean-up DAD vs tentative address
>
> D: clean-up NS (including DAD) vs tentative address
Applied, thanks Yoshfuji.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-02-06 23:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-06 9:10 [PATCH 1/3] IPV6: clean-up DAD vs tentative address YOSHIFUJI Hideaki / 吉藤英明
2004-02-06 23:30 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).