From: Stefan Schmidt <stefan@osg•samsung.com>
To: Alexander Aring <aar@pengutronix•de>, linux-wpan@vger•kernel.org
Cc: kernel@pengutronix•de, marcel@holtmann•org,
jukka.rissanen@linux•intel.com, hannes@stressinduktion•org,
mcr@sandelman•ca, werner@almesberger•net,
linux-bluetooth@vger•kernel.org, netdev@vger•kernel.org,
"David S . Miller" <davem@davemloft•net>,
Alexey Kuznetsov <kuznet@ms2•inr.ac.ru>,
James Morris <jmorris@namei•org>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6•org>,
Patrick McHardy <kaber@trash•net>
Subject: Re: [PATCHv2 bluetooth-next 06/10] ndisc: add addr_len parameter to ndisc_fill_addr_option
Date: Tue, 3 May 2016 20:17:24 +0200 [thread overview]
Message-ID: <5728EB34.6040506@osg.samsung.com> (raw)
In-Reply-To: <1461140382-4784-7-git-send-email-aar@pengutronix.de>
Hello.
On 20/04/16 10:19, Alexander Aring wrote:
> This patch makes the address length as argument for the
> ndisc_fill_addr_option function. This is necessary to handle addresses
> which don't use dev->addr_len as address length.
>
> Cc: David S. Miller<davem@davemloft•net>
> Cc: Alexey Kuznetsov<kuznet@ms2•inr.ac.ru>
> Cc: James Morris<jmorris@namei•org>
> Cc: Hideaki YOSHIFUJI<yoshfuji@linux-ipv6•org>
> Cc: Patrick McHardy<kaber@trash•net>
> Signed-off-by: Alexander Aring<aar@pengutronix•de>
> ---
> net/ipv6/ndisc.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index 4e91d5e..176c7c4 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -150,11 +150,11 @@ struct neigh_table nd_tbl = {
> };
> EXPORT_SYMBOL_GPL(nd_tbl);
>
> -static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data)
> +static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data,
> + int data_len)
> {
> int pad = ndisc_addr_option_pad(skb->dev->type);
> - int data_len = skb->dev->addr_len;
> - int space = ndisc_opt_addr_space(skb->dev, skb->dev->addr_len);
> + int space = ndisc_opt_addr_space(skb->dev, data_len);
> u8 *opt = skb_put(skb, space);
>
> opt[0] = type;
> @@ -528,7 +528,7 @@ void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr,
>
> if (inc_opt)
> ndisc_fill_addr_option(skb, ND_OPT_TARGET_LL_ADDR,
> - dev->dev_addr);
> + dev->dev_addr, dev->addr_len);
>
>
> ndisc_send_skb(skb, daddr, src_addr);
> @@ -590,7 +590,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit,
>
> if (inc_opt)
> ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR,
> - dev->dev_addr);
> + dev->dev_addr, dev->addr_len);
>
> ndisc_send_skb(skb, daddr, saddr);
> }
> @@ -641,7 +641,7 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
>
> if (send_sllao)
> ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR,
> - dev->dev_addr);
> + dev->dev_addr, dev->addr_len);
>
> ndisc_send_skb(skb, daddr, saddr);
> }
> @@ -1597,7 +1597,8 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
> */
>
> if (ha)
> - ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha);
> + ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha,
> + dev->addr_len);
>
> /*
> * build redirect option and copy skb over to the new packet.
Reviewed-by: Stefan Schmidt<stefan@osg•samsung.com>
regards
Stefan Schmidt
next prev parent reply other threads:[~2016-05-03 18:17 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 8:19 [PATCHv2 bluetooth-next 00/10] 6lowpan: introduce basic 6lowpan-nd Alexander Aring
[not found] ` <1461140382-4784-1-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 01/10] 6lowpan: add private neighbour data Alexander Aring
2016-05-02 18:59 ` Hannes Frederic Sowa
2016-05-04 10:43 ` Alexander Aring
2016-05-03 18:16 ` Stefan Schmidt
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 02/10] 6lowpan: add 802.15.4 short addr slaac Alexander Aring
2016-05-02 19:06 ` Hannes Frederic Sowa
[not found] ` <1461140382-4784-3-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-03 18:16 ` Stefan Schmidt
2016-05-06 9:26 ` Alexander Aring
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 03/10] 6lowpan: remove ipv6 module request Alexander Aring
2016-05-02 19:06 ` Hannes Frederic Sowa
2016-05-03 18:16 ` Stefan Schmidt
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 04/10] ndisc: add addr_len parameter to ndisc_opt_addr_space Alexander Aring
2016-05-02 19:37 ` Hannes Frederic Sowa
2016-05-04 12:30 ` Alexander Aring
[not found] ` <800c5c08-c2c8-3b44-d457-cdcf6374f280-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-06 22:23 ` Hannes Frederic Sowa
2016-05-08 10:39 ` Alexander Aring
2016-05-18 21:39 ` Michael Richardson
2016-05-03 18:17 ` Stefan Schmidt
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 05/10] ndisc: add addr_len parameter to ndisc_opt_addr_data Alexander Aring
2016-05-03 18:17 ` Stefan Schmidt
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 07/10] ipv6: introduce neighbour discovery ops Alexander Aring
2016-05-02 19:36 ` Hannes Frederic Sowa
[not found] ` <fbd4c25c-2673-2848-c636-a5d21a6890d7-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r@public.gmane.org>
2016-05-03 18:17 ` Stefan Schmidt
[not found] ` <5728EB3F.2060808-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2016-05-06 9:36 ` Alexander Aring
[not found] ` <1461140382-4784-8-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-04 12:23 ` Stefan Schmidt
[not found] ` <5729E9AB.5000301-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2016-05-06 9:47 ` Alexander Aring
2016-05-06 10:19 ` Alexander Aring
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 09/10] 6lowpan: introduce 6lowpan-nd Alexander Aring
[not found] ` <1461140382-4784-10-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-04 12:23 ` Stefan Schmidt
2016-05-02 17:25 ` [PATCHv2 bluetooth-next 00/10] 6lowpan: introduce basic 6lowpan-nd Marcel Holtmann
[not found] ` <D212A5BF-A414-403B-A409-1F8C2D279883-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
2016-05-02 19:52 ` Hannes Frederic Sowa
[not found] ` <870fdf5f-82ed-b621-a8d5-625bf9d81d0d-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r@public.gmane.org>
2016-05-02 23:17 ` Marcel Holtmann
[not found] ` <58926844-0338-4D63-A5B6-DB0EBE903A0E-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
2016-05-03 20:07 ` David Miller
2016-05-13 2:59 ` YOSHIFUJI Hideaki
[not found] ` <57354315.2050509-GmhWrQMWH5w7YuNMryXyOw@public.gmane.org>
2016-05-13 12:33 ` Alexander Aring
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 06/10] ndisc: add addr_len parameter to ndisc_fill_addr_option Alexander Aring
2016-05-03 18:17 ` Stefan Schmidt [this message]
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 08/10] ipv6: export ndisc functions Alexander Aring
2016-05-02 19:39 ` Hannes Frederic Sowa
2016-05-08 10:46 ` Alexander Aring
[not found] ` <1461140382-4784-9-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-04 12:23 ` Stefan Schmidt
2016-04-20 8:19 ` [PATCHv2 bluetooth-next 10/10] 6lowpan: add support for 802.15.4 short addr handling Alexander Aring
[not found] ` <1461140382-4784-11-git-send-email-aar-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2016-05-04 12:23 ` Stefan Schmidt
2016-04-28 11:36 ` [PATCHv2 bluetooth-next 00/10] 6lowpan: introduce basic 6lowpan-nd Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5728EB34.6040506@osg.samsung.com \
--to=stefan@osg$(echo .)samsung.com \
--cc=aar@pengutronix$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=hannes@stressinduktion$(echo .)org \
--cc=jmorris@namei$(echo .)org \
--cc=jukka.rissanen@linux$(echo .)intel.com \
--cc=kaber@trash$(echo .)net \
--cc=kernel@pengutronix$(echo .)de \
--cc=kuznet@ms2$(echo .)inr.ac.ru \
--cc=linux-bluetooth@vger$(echo .)kernel.org \
--cc=linux-wpan@vger$(echo .)kernel.org \
--cc=marcel@holtmann$(echo .)org \
--cc=mcr@sandelman$(echo .)ca \
--cc=netdev@vger$(echo .)kernel.org \
--cc=werner@almesberger$(echo .)net \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox