Skip to contentSkip to conversation

ipv6:use ipv6_addr_type instead of __ipv6_addr_type

PATCH In review Yang Hongyang 2 participants 7 messages May 7, 2009 – May 8, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipv6:use ipv6_addr_type instead of __ipv6_addr_type

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

---
 net/ipv6/addrconf.c |    4 ++--
 net/ipv6/datagram.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
net/ipv6/addrconf.c +2 -2
index a8218bc..01b7a83 100644
@@ -1126,7 +1126,7 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
 	struct net_device *dev;
 	int dst_type;
 
-	dst_type = __ipv6_addr_type(daddr);
+	dst_type = ipv6_addr_type(daddr);
 	dst.addr = daddr;
 	dst.ifindex = dst_dev ? dst_dev->ifindex : 0;
 	dst.scope = __ipv6_addr_src_scope(dst_type);
@@ -1181,7 +1181,7 @@ int ipv6_dev_get_saddr(struct net *net, struct net_device *dst_dev,
 			    (!(score->ifa->flags & IFA_F_OPTIMISTIC)))
 				continue;
 
-			score->addr_type = __ipv6_addr_type(&score->ifa->addr);
+			score->addr_type = ipv6_addr_type(&score->ifa->addr);
 
 			if (unlikely(score->addr_type == IPV6_ADDR_ANY ||
 				     score->addr_type & IPV6_ADDR_MULTICAST)) {
net/ipv6/datagram.c +1 -1
index e2bdc6d..7ea5c77 100644
@@ -537,7 +537,7 @@ int datagram_send_ctl(struct net *net,
 				fl->oif = src_info->ipi6_ifindex;
 			}
 
-			addr_type = __ipv6_addr_type(&src_info->ipi6_addr);
+			addr_type = ipv6_addr_type(&src_info->ipi6_addr);
 
 			if (fl->oif) {
 				dev = dev_get_by_index(net, fl->oif);
Signature · 6 lines
1.6.0.3


-- 
Regards
Yang Hongyang
maintainer
#1 lore raw

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 4 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

#2 lore raw
Quoted 6 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 3 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Quoted 6 lines
Quoted 1 line

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

My advice here is that the function which has __ maybe shouldn't be directly used.

Since the return of __ipv6_addr_type is needed by __ipv6_addr_src_scope,there should comes another patch to covert use of __ipv6_addr_src_scope to ipv6_addr_src_scope.To make this serie of the patch shouldn't be a problem because there are not so much use of these, two or three places.

That's my advice.:)

Signature · 2 lines
Regards
Yang Hongyang
maintainer
#3 lore raw

From: Yang Hongyang <[email protected]>
Date: Fri, 08 May 2009 09:18:11 +0800

Quoted 7 lines
Quoted 6 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 3 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

My advice here is that the function which has __ maybe shouldn't be directly used.

You're using vague terms like "advice" and "maybe" and this only decreases my confidence in your change.

You're also not addressing my questions at all.

Two "_" characters at the beginning of the function's name says nothing about whether these call sites want the scope bits present in the return value they receive.

This seems like a completely pointless and mindless change, and in fact might introduce bugs.

There is no way I'm applying this. You can't even explain if the patch is correct or not. In fact, I doubt you even know.

maintainer
#4 lore raw

From: David Miller <[email protected]>
Date: Fri, 08 May 2009 00:44:20 -0700 (PDT)

Quoted 18 lines

From: Yang Hongyang <[email protected]>
Date: Fri, 08 May 2009 09:18:11 +0800

Quoted 15 lines
Quoted 6 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 3 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Quoted 6 lines
Quoted 1 line

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

My advice here is that the function which has __ maybe shouldn't be directly used.

I also want to address this statement on it's own, it's simply not true.

"__" means "think carefully before using this function", or "this function requires a special environment for proper usage"

It DOES NOT mean "do not use directly." It's never meant this.

So ever basis for your patch is fundamentally flawed.

#5 lore raw
Quoted 20 lines · David Miller

From: David Miller <[email protected]>
Date: Fri, 08 May 2009 00:44:20 -0700 (PDT)

Quoted 16 lines

From: Yang Hongyang <[email protected]>
Date: Fri, 08 May 2009 09:18:11 +0800

Quoted 13 lines
Quoted 11 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 4 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

My advice here is that the function which has __ maybe shouldn't be directly used.

Quoted 7 lines

I also want to address this statement on it's own, it's simply not true.

"__" means "think carefully before using this function", or "this function requires a special environment for proper usage"

It DOES NOT mean "do not use directly." It's never meant this.

I was wrong,thank you for your patience to explain this.

Quoted 4 lines

So ever basis for your patch is fundamentally flawed.

Signature · 2 lines
Regards
Yang Hongyang
#6 lore raw
In reply to David Miller
Quoted 11 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Fri, 08 May 2009 09:18:11 +0800

Quoted 8 lines
Quoted 7 lines · David Miller

From: Yang Hongyang <[email protected]>
Date: Thu, 07 May 2009 15:47:38 +0800

Quoted 4 lines

Although the function of these two functions are the same,we should use the encapsulation function of __ipv6_addr_type

Quoted 8 lines
Quoted 5 lines
Quoted 4 lines

Are you sure? ipv6_addr_type() masks out the upper 16-bits of __ipv6_addr_type()'s return value, which is the scope.

I'm not convinced that is what we want to do here.

My advice here is that the function which has __ maybe shouldn't be directly used.

You're using vague terms like "advice" and "maybe" and this only decreases my confidence in your change.

Yes,I said maybe because I judge this change by search the code.There are many places that use ipv6_addr_type() but only three places out of ipv6.h use __ipv6_addr_type().Now, there are two methods can to do the right things, one is ipv6_addr_type(),another is __ipv6_addr_type().There's no doult that These three places can be converted to use ipv6_addr_type().I said converted because it's not just change __ipv6_addr_type() to ipv6_addr_type().

Of course you can say that this dose not imply that we *should* do this change. I agree,so I just said this is a advice:)

Quoted 6 lines

You're also not addressing my questions at all.

Two "_" characters at the beginning of the function's name says nothing about whether these call sites want the scope bits present in the return value they receive.

I used to think Two "_" means the funtion shouldn't(or should better not) be called outside of the file.You teach me,thank you!

Quoted 3 lines

This seems like a completely pointless and mindless change, and in fact might introduce bugs.

If you think this is a pointless change,you can just ingore it, So sorry for the inconvenience:(But I don't think it's mindless,Because before you teach me, I really misunderstand Two "_" means .

Quoted 4 lines

There is no way I'm applying this. You can't even explain if the patch is correct or not. In fact, I doubt you even know.

Yes,this single patch is not correct.As I said,this patch should together with another patch to covert use of __ipv6_addr_src_scope to ipv6_addr_src_scope.

Signature · 2 lines
Regards
Yang Hongyang