[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <512016E8.30305@linux-ipv6.org>
Date: Sun, 17 Feb 2013 08:31:52 +0900
From: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>
To: hannes@...essinduktion.org
CC: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>,
netdev@...r.kernel.org, brian.haley@...com
Subject: Re: [PATCH net-next v2 1/4] ipv6: introduce new type ipv6_addr_props
to hold ipv6 address type and scope
YOSHIFUJI Hideaki wrote:
> Hannes Frederic Sowa wrote:
>> This simplifies ipv6 address type handling. The old implementation had
>> the problem that scope and type where both squeezed into one int. Because
>> of this it was dangerous to do comparisons on it or check for scope while
>> it is actually being stripped out. This patch mainly improves type safety.
>>
>> v2:
>> a) Incorportated feedback from Brian Haley
>> b) fix style in addrconf_core.c:__ipv6_addr_props
>>
>> Cc: YOSHIFUJI Hideaki <yoshfuji@...ux-ipv6.org>
>> Cc: Brian Haley <brian.haley@...com>
>> Signed-off-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
>> ---
>> include/net/ipv6.h | 20 ++++++----
>> net/ipv6/addrconf.c | 28 +++++++-------
>> net/ipv6/addrconf_core.c | 99 +++++++++++++++++++++++++++++++-----------------
>> net/ipv6/datagram.c | 12 +++---
>> 4 files changed, 99 insertions(+), 60 deletions(-)
>>
>> diff --git a/include/net/ipv6.h b/include/net/ipv6.h
>> index 851d541..a14700c 100644
>> --- a/include/net/ipv6.h
>> +++ b/include/net/ipv6.h
>> @@ -298,25 +298,31 @@ static inline int ip6_frag_mem(struct net *net)
>> #define IPV6_FRAG_LOW_THRESH (3 * 1024*1024) /* 3145728 */
>> #define IPV6_FRAG_TIMEOUT (60 * HZ) /* 60 seconds */
>>
>> -extern int __ipv6_addr_type(const struct in6_addr *addr);
>> -static inline int ipv6_addr_type(const struct in6_addr *addr)
>> +struct ipv6_addr_props {
>> + u16 type;
>> + s16 scope;
>> +};
>> +
>> +extern struct ipv6_addr_props __ipv6_addr_props(const struct in6_addr *addr);
>> +static inline unsigned int ipv6_addr_type(const struct in6_addr *addr)
>> {
>> - return __ipv6_addr_type(addr) & 0xffff;
>> + return __ipv6_addr_props(addr).type;
>> }
>>
>> static inline int ipv6_addr_scope(const struct in6_addr *addr)
>> {
>> - return __ipv6_addr_type(addr) & IPV6_ADDR_SCOPE_MASK;
>> + return __ipv6_addr_props(addr).scope;
>> }
>>
>
> NAK. This does not return correct value as before.
> If you are going to covert this, please do not try to
> change usage of inlines.
I meant
struct ipv6_addrtype {
__u16 type;
__s16 scope;
};
struct ipv6_addrtype __ipv6_addr_type(const struct in6_addr *addr);
int ipv6_addr_type(const struct in6_addr *addr)
{
return __ipv6_addr_type(addr).type;
}
And most users should not be touched except for it type name
(int => struct addrtype).
--yohsfuji
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists