the scheduled ieee80211 softmac removal

[linux-2.6] / net / ipv4 / af_inet.c

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 25871c6c7444d77589e8fb4a597839399855800c..4cb8a1385539e3a82123f4c6c3e32a852570f312 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1317,18 +1317,15 @@ 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);
@@ -1426,10 +1423,8 @@ 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