diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index b82e3527..b4d7469 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -407,6 +407,10 @@
 	struct rt6_info *rt6, *rt6_local;
 	int rc = -ENOMEM;
 
+	/* IPv6 can be CONFIG enabled and then disabled runtime */
+	if (!ipv6_mod_enabled())
+		return 0;
+
 	rt6i_table = fib6_new_table(net, vrf->tb_id);
 	if (!rt6i_table)
 		goto out;
@@ -919,6 +923,9 @@
 	struct sk_buff *skb;
 	int err;
 
+	if (family == AF_INET6 && !ipv6_mod_enabled())
+		return 0;
+
 	skb = nlmsg_new(vrf_fib_rule_nl_size(), GFP_KERNEL);
 	if (!skb)
 		return -ENOMEM;