net: Convert net_ratelimit uses to net_<level>_ratelimited

[linux-2.6-block.git] / net / ipv4 / ip_fragment.c

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 3727e234c88444cfa420845d3f899a62b57312a0..9f9bd139335f42fb881f613da04fbe1c5a1049c8 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -569,7 +569,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
                skb_morph(head, qp->q.fragments);
                head->next = qp->q.fragments->next;
 
-               kfree_skb(qp->q.fragments);
+               consume_skb(qp->q.fragments);
                qp->q.fragments = head;
        }
 
@@ -644,8 +644,7 @@ out_nomem:
        err = -ENOMEM;
        goto out_fail;
 out_oversize:
-       if (net_ratelimit())
-               pr_info("Oversized IP packet from %pI4\n", &qp->saddr);
+       net_info_ratelimited("Oversized IP packet from %pI4\n", &qp->saddr);
 out_fail:
        IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
        return err;
@@ -782,7 +781,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
                table[2].data = &net->ipv4.frags.timeout;
        }
 
-       hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table);
+       hdr = register_net_sysctl(net, "net/ipv4", table);
        if (hdr == NULL)
                goto err_reg;
 
@@ -807,7 +806,7 @@ static void __net_exit ip4_frags_ns_ctl_unregister(struct net *net)
 
 static void ip4_frags_ctl_register(void)
 {
-       register_net_sysctl_rotable(net_ipv4_ctl_path, ip4_frags_ctl_table);
+       register_net_sysctl(&init_net, "net/ipv4", ip4_frags_ctl_table);
 }
 #else
 static inline int ip4_frags_ns_ctl_register(struct net *net)