From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF5DBC432C2 for ; Wed, 25 Sep 2019 14:49:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 810FA21D7C for ; Wed, 25 Sep 2019 14:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569422985; bh=ykX/7+gfBHlCMayR/n2RdjILSqk1WHcSmLySayDT1kA=; h=From:To:Cc:Subject:Date:List-ID:From; b=yuBCAp7K7Escfx9K87hIKppGlIklUbkWyPOd10o3iPxBFjciEGbbRm5wKK4eJaFQo UV5wpfWPaXI+6l+rUjf/po0xumWdGiz/nYHLr6+eGAB+S1+J+1SmwY6uZBHDIkAeaC AEU1uflREn7hxlCSAfnRdemp+SedF9lMcILJxvYQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407623AbfIYOto (ORCPT ); Wed, 25 Sep 2019 10:49:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:49724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405664AbfIYOto (ORCPT ); Wed, 25 Sep 2019 10:49:44 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA40921D7C; Wed, 25 Sep 2019 14:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569422983; bh=ykX/7+gfBHlCMayR/n2RdjILSqk1WHcSmLySayDT1kA=; h=From:To:Cc:Subject:Date:From; b=OTqtK4GNQTffjZTniJv650XBJZ/StWH/yyPqifXOd2RQLZ3hyv1y0PWqzy07vbh3G 4oxP7cmpqvFzH//RUCEiX3hnA9u1DYm7GrtHUrtq5iKWKUl+SEBIaJv3dlyyLOf7f2 TZfSVer35rC7F0HXF5O4ryTbqQBUp0xNW6BEhlgE= From: David Ahern To: davem@davemloft.net, jakub.kicinski@netronome.com Cc: netdev@vger.kernel.org, David Ahern , Patrick Ruddy Subject: [PATCH net] vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled Date: Wed, 25 Sep 2019 07:53:19 -0700 Message-Id: <20190925145319.26801-1-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern A user reported that vrf create fails when IPv6 is disabled at boot using 'ipv6.disable=1': https://bugzilla.kernel.org/show_bug.cgi?id=204903 The failure is adding fib rules at create time. Add RTNL_FAMILY_IP6MR to the check in vrf_fib_rule if ipv6_mod_enabled is disabled. Fixes: e4a38c0c4b27 ("ipv6: add vrf table handling code for ipv6 mcast") Signed-off-by: David Ahern Cc: Patrick Ruddy --- drivers/net/vrf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 6e84328bdd40..a4b38a980c3c 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -1154,7 +1154,8 @@ static int vrf_fib_rule(const struct net_device *dev, __u8 family, bool add_it) struct sk_buff *skb; int err; - if (family == AF_INET6 && !ipv6_mod_enabled()) + if ((family == AF_INET6 || family == RTNL_FAMILY_IP6MR) && + !ipv6_mod_enabled()) return 0; skb = nlmsg_new(vrf_fib_rule_nl_size(), GFP_KERNEL); -- 2.11.0