[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51962B7A.9090703@cogentembedded.com>
Date: Fri, 17 May 2013 17:07:06 +0400
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Cong Wang <amwang@...hat.com>
CC: netdev@...r.kernel.org, David Miller <davem@...emloft.net>
Subject: Re: [Patch net-next v8 07/11] vxlan: respect disable_ipv6 sysctl
On 17-05-2013 4:21, Cong Wang wrote:
> From: Cong Wang <amwang@...hat.com>
> When disable_ipv6 is set, we should not allow IPv6 vxlan
> device created on top of it.
> Cc: David Miller <davem@...emloft.net>
> Signed-off-by: Cong Wang <amwang@...hat.com>
> ---
> drivers/net/vxlan.c | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index 46c59a6..1ee79e0 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
[...]
> @@ -1734,6 +1737,17 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
> return -ENODEV;
> }
>
> +#if IS_ENABLED(CONFIG_IPV6)
Why not:
if (IS_ENABLED(CONFIG_IPV6))
#if's in the function body are frowned upon.
> + if (use_ipv6) {
> + struct inet6_dev *idev = in6_dev_get(lowerdev);
Empty line wouldn't hurt here, after declaration...
> + if (idev && idev->cnf.disable_ipv6) {
> + pr_info("IPv6 is disabled via sysctl\n");
> + return -EPERM;
> + }
> + }
> +#else
> + BUG_ON(use_ipv6);
> +#endif
WBR, Sergei
--
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