net: replace remaining __FUNCTION__ occurrences

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 4f539bd48718eb0d26c692866a8d3f429fcbc5a6..25871c6c7444d77589e8fb4a597839399855800c 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1060,7 +1060,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)
        if (sysctl_ip_dynaddr > 1) {
                printk(KERN_INFO "%s(): shifting inet->"
                                 "saddr from %d.%d.%d.%d to %d.%d.%d.%d\n",
-                      __FUNCTION__,
+                      __func__,
                       NIPQUAD(old_saddr),
                       NIPQUAD(new_saddr));
        }
@@ -1317,15 +1317,18 @@ static int __init init_ipv4_mibs(void)
        if (snmp_mib_init((void **)udp_statistics,
                          sizeof(struct udp_mib)) < 0)
                goto err_udp_mib;
+#ifdef CONFIG_IP_UDPLITE
        if (snmp_mib_init((void **)udplite_statistics,
                          sizeof(struct udp_mib)) < 0)
                goto err_udplite_mib;
-
+#endif
        tcp_mib_init();
 
        return 0;
 
+#ifdef CONFIG_IP_UDPLITE
 err_udplite_mib:
+#endif
        snmp_mib_free((void **)udp_statistics);
 err_udp_mib:
        snmp_mib_free((void **)tcp_statistics);
@@ -1423,8 +1426,10 @@ static int __init inet_init(void)
        /* Setup UDP memory threshold */
        udp_init();
 
+#ifdef CONFIG_IP_UDPLITE
        /* Add UDP-Lite (RFC 3828) */
        udplite4_register();
+#endif
 
        /*
         *      Set the ICMP layer up