From: Nicolas Dichtel <nicolas.dichtel@6wind•com>
To: David Miller <davem@davemloft•net>
Cc: fengguang.wu@intel•com, netdev@vger•kernel.org
Subject: Re: [net-next:master 153/162] net/ipv6/addrconf.c:503:11: error: 'struct ipv6_devconf' has no member named 'mc_forwarding'
Date: Tue, 04 Dec 2012 21:00:11 +0100 [thread overview]
Message-ID: <50BE564B.6040507@6wind.com> (raw)
In-Reply-To: <20121204.144702.1067637950249633761.davem@davemloft.net>
Le 04/12/2012 20:47, David Miller a écrit :
>
> Thanks, fixed as follows:
>
> --------------------
> [PATCH] ipv6: Protect ->mc_forwarding access with CONFIG_IPV6_MROUTE
>
> Reported-by: Fengguang Wu <fengguang.wu@intel•com>
> Signed-off-by: David S. Miller <davem@davemloft•net>
Sorry for that and thank you for the fix and the report.
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind•com>
> ---
> net/ipv6/addrconf.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index 28e0e62..6fca01f 100644
> --- a/net/ipv6/addrconf.c
> +++ b/net/ipv6/addrconf.c
> @@ -469,8 +469,10 @@ static int inet6_netconf_msgsize_devconf(int type)
> /* type -1 is used for ALL */
> if (type == -1 || type == NETCONFA_FORWARDING)
> size += nla_total_size(4);
> +#ifdef CONFIG_IPV6_MROUTE
> if (type == -1 || type == NETCONFA_MC_FORWARDING)
> size += nla_total_size(4);
> +#endif
>
> return size;
> }
> @@ -498,11 +500,12 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,
> if ((type == -1 || type == NETCONFA_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_FORWARDING, devconf->forwarding) < 0)
> goto nla_put_failure;
> +#ifdef CONFIG_IPV6_MROUTE
> if ((type == -1 || type == NETCONFA_MC_FORWARDING) &&
> nla_put_s32(skb, NETCONFA_MC_FORWARDING,
> devconf->mc_forwarding) < 0)
> goto nla_put_failure;
> -
> +#endif
> return nlmsg_end(skb, nlh);
>
> nla_put_failure:
prev parent reply other threads:[~2012-12-04 20:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 19:39 [net-next:master 153/162] net/ipv6/addrconf.c:503:11: error: 'struct ipv6_devconf' has no member named 'mc_forwarding' kbuild test robot
2012-12-04 19:47 ` David Miller
2012-12-04 20:00 ` Nicolas Dichtel [this message]
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=50BE564B.6040507@6wind.com \
--to=nicolas.dichtel@6wind$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=fengguang.wu@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.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