2005-11-14 10:40:57

by Yan Zheng

Subject: [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)

The "score.rule++" doesn't make any sense for me.
According to codes above, I think it should be "hiscore.rule++;" .


Signed-off-by: Yan Zheng<[email protected]>

Index: net/ipv6/addrconf.c
============================================================
--- a/net/ipv6/addrconf.c 2005-11-13 12:23:06.000000000 +0800
+++ b/net/ipv6/addrconf.c 2005-11-14 18:29:27.000000000 +0800
@@ -1045,9 +1045,10 @@ int ipv6_dev_get_saddr(struct net_device
}
#endif
/* Rule 8: Use longest matching prefix */
- if (hiscore.rule < 8)
+ if (hiscore.rule < 8) {
hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
- score.rule++;
+ hiscore.rule++;
+ }
score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);
if (score.matchlen > hiscore.matchlen) {
score.rule = 8;

2005-11-15 01:22:14

by YOSHIFUJI Hideaki

Subject: Re: [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)

In article <[email protected]> (at Mon, 14 Nov 2005 18:42:30 +0800), Yan Zheng <[email protected]> says:

> The "score.rule++" doesn't make any sense for me.
> According to codes above, I think it should be "hiscore.rule++;" .

Oops, you're right.

> Signed-off-by: Yan Zheng<[email protected]>
Acked-by: YOSHIFUJI Hideaki <[email protected]>

> /* Rule 8: Use longest matching prefix */
> - if (hiscore.rule < 8)
> + if (hiscore.rule < 8) {
> hiscore.matchlen = ipv6_addr_diff(&ifa_result->addr, daddr);
> - score.rule++;
> + hiscore.rule++;
> + }
> score.matchlen = ipv6_addr_diff(&ifa->addr, daddr);
> if (score.matchlen > hiscore.matchlen) {
> score.rule = 8;
>

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

2005-11-15 05:42:49

by David Miller

Subject: Re: [PATCH]IPv6: small fix for ipv6_dev_get_saddr(...)

From: YOSHIFUJI Hideaki <[email protected]>
Date: Tue, 15 Nov 2005 10:22:37 +0900 (JST)

> In article <[email protected]> (at Mon, 14 Nov 2005 18:42:30 +0800), Yan Zheng <[email protected]> says:
>
> > The "score.rule++" doesn't make any sense for me.
> > According to codes above, I think it should be "hiscore.rule++;" .
>
> Oops, you're right.
>
> > Signed-off-by: Yan Zheng<[email protected]>
> Acked-by: YOSHIFUJI Hideaki <[email protected]>

Applied.