[IPV6]: make flowlabel to return an error

This patch makes the flowlab subsystem to return an error code and makes
some cleanup with procfs ifdefs.
The af_inet6 will use the flowlabel init return code to check the initialization
was correct.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 1 deletions

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 90d2f723fc46..614f3d905dd1 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -851,7 +851,9 @@ static int __init inet6_init(void)
         err = ip6_route_init();
         if (err)
                 goto ip6_route_fail;
-        ip6_flowlabel_init();
+        err = ip6_flowlabel_init();
+        if (err)
+                goto ip6_flowlabel_fail;
         err = addrconf_init();
         if (err)
                 goto addrconf_fail;
@@ -874,6 +876,7 @@ out:
 
 addrconf_fail:
         ip6_flowlabel_cleanup();
+ip6_flowlabel_fail:
         ip6_route_cleanup();
 ip6_route_fail:
 #ifdef CONFIG_PROC_FS