Hi Hannes,
On 05/27/2016 06:56 PM, Hannes Frederic Sowa wrote:
> On 25.05.2016 07:15, YOSHIFUJI Hideaki wrote:
>>
>>
>> Alexander Aring wrote:
>>> This patch removes the net_device parameter from ndisc_opt_addr_space
>>> function. This can be useful for calling such functionality which
>>> doesn't depends on dev parameter. For current existing functionality
>>> which depends on dev parameter, we introduce ndisc_dev_opt_addr_space to have
>>> an easy replacement for the ndisc_opt_addr_space function.
>>>
>>> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
>>> Cc: Alexey Kuznetsov <kuznet@xxxxxxxxxxxxx>
>>> Cc: James Morris <jmorris@xxxxxxxxx>
>>> Cc: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>
>>> Cc: Patrick McHardy <kaber@xxxxxxxxx>
>>> Signed-off-by: Alexander Aring <aar@xxxxxxxxxxxxxx>
>>> ---
>>> include/net/ndisc.h | 13 +++++++++----
>>> net/ipv6/ndisc.c | 12 ++++++------
>>> 2 files changed, 15 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/include/net/ndisc.h b/include/net/ndisc.h
>>> index 2d8edaa..dbc8d01 100644
>>> --- a/include/net/ndisc.h
>>> +++ b/include/net/ndisc.h
>>> @@ -127,10 +127,15 @@ static inline int ndisc_addr_option_pad(unsigned short type)
>>> }
>>> }
>>>
>>> -static inline int ndisc_opt_addr_space(struct net_device *dev)
>>> +static inline int ndisc_opt_addr_space(unsigned char addr_len, int pad)
>>> {
>>> - return NDISC_OPT_SPACE(dev->addr_len +
>>> - ndisc_addr_option_pad(dev->type));
>>> + return NDISC_OPT_SPACE(addr_len + pad);
>>> +}
>>> +
>>> +static inline int ndisc_dev_opt_addr_space(const struct net_device *dev)
>>> +{
>>> + return ndisc_opt_addr_space(dev->addr_len,
>>> + ndisc_addr_option_pad(dev->type));
>>> }
>>>
>>
>> I prefer not to change existing functions such as ndisc_opt_addr_space(),
>> and name new function __ndisc_opt_addr_space() etc.
>>
>> Plus, my original thought (when I implement these functions) was to
>> have per-net_device ndisc_opt_addr_spece(), ndisc_opt_adr_data() etc.
>>
>> What do you think of that?
>
> As I understood it 6lowpan devices need to handle both, non-compressed
> and compressed options/addresses. Probably one can make them
> per-interface, but a change to the arguments has still to happen.
>
Yes, we need to handle both addresses at the same time.
I think you mixed some keywords here: "non-compressed/compressed", it
should be extended(sometimes also named long) and short address.
But the short address is an optional address, the extended address is
always available (that's why we handle them as dev->addr).
I suppose Hideaki suggest here to don't rename the function, what I have
now is:
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 2d8edaa..4cee826 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -127,10 +127,15 @@ static inline int ndisc_addr_option_pad(unsigned short type)
}
}
+static inline int __ndisc_opt_addr_space(unsigned char addr_len, int pad)
+{
+ return NDISC_OPT_SPACE(addr_len + pad);
+}
+
static inline int ndisc_opt_addr_space(struct net_device *dev)
{
- return NDISC_OPT_SPACE(dev->addr_len +
- ndisc_addr_option_pad(dev->type));
+ return __ndisc_opt_addr_space(dev->addr_len,
+ ndisc_addr_option_pad(dev->type));
}
static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p,
--
which removes a lot the renaming stuff in "ndisc.c". I can still use
"__ndisc_opt_addr_space" as a function which doesn't require net_device
argument. Example:
addr_space = __ndisc_opt_addr_space(IEEE802154_SHORT_ADDR_LEN, 0);
Looks better now.
- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
