ip_frag: struct inet_frags match() method returns a bool

[deliverable/linux.git] / net / ipv4 / ip_fragment.c

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 71e5c328176c0e1527b4a921a4c172f7b7c871cb..695b27f44161b5656bb54863f9a983fb23ae5206 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -148,17 +148,17 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q)
        return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol);
 }
 
-static int ip4_frag_match(struct inet_frag_queue *q, void *a)
+static bool ip4_frag_match(struct inet_frag_queue *q, void *a)
 {
        struct ipq *qp;
        struct ip4_create_arg *arg = a;
 
        qp = container_of(q, struct ipq, q);
        return  qp->id == arg->iph->id &&
-                       qp->saddr == arg->iph->saddr &&
-                       qp->daddr == arg->iph->daddr &&
-                       qp->protocol == arg->iph->protocol &&
-                       qp->user == arg->user;
+               qp->saddr == arg->iph->saddr &&
+               qp->daddr == arg->iph->daddr &&
+               qp->protocol == arg->iph->protocol &&
+               qp->user == arg->user;
 }
 
 /* Memory Tracking Functions. */
@@ -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;