path: root/drivers
diff options
authorDavid Ahern <>2019-09-25 07:53:19 -0700
committerDavid S. Miller <>2019-09-27 20:07:05 +0200
commitdac91170f8e9c73784af5fad6225e954b795601c (patch)
treef153f5702dc01ec960ffd052cfd5b7b7acdf5e3a /drivers
parent3c30819dc68ab9498216421b6846123900c0a6d3 (diff)
vrf: Do not attempt to create IPv6 mcast rule if IPv6 is disabled
A user reported that vrf create fails when IPv6 is disabled at boot using 'ipv6.disable=1': 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 <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'drivers')
1 files changed, 2 insertions, 1 deletions
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);