summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-15 02:41:09 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-15 12:26:43 -0700
commit4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d (patch)
tree9db94b2ba84ed823305cd45c52f652760ea7809a /net/ipv4
parent8e7999c44ee95e1e90ac91c83557a04e2948f160 (diff)
[INET]: Small cleanup for xxx_put after evictor consolidation
After the evictor code is consolidated there is no need in passing the extra pointer to the xxx_put() functions. The only place when it made sense was the evictor code itself. Maybe this change must got with the previous (or with the next) patch, but I try to make them shorter as much as possible to simplify the review (but they are still large anyway), so this change goes in a separate patch. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_fragment.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index ee6e04159627..6676600220c5 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -155,10 +155,10 @@ static __inline__ struct ipq *frag_alloc_queue(void)
/* Destruction primitives. */
-static __inline__ void ipq_put(struct ipq *ipq, int *work)
+static __inline__ void ipq_put(struct ipq *ipq)
{
if (atomic_dec_and_test(&ipq->q.refcnt))
- inet_frag_destroy(&ipq->q, &ip4_frags, work);
+ inet_frag_destroy(&ipq->q, &ip4_frags, NULL);
}
/* Kill ipq entry. It is not destroyed immediately,
@@ -208,7 +208,7 @@ static void ip_expire(unsigned long arg)
}
out:
spin_unlock(&qp->q.lock);
- ipq_put(qp, NULL);
+ ipq_put(qp);
}
/* Creation primitives. */
@@ -238,7 +238,7 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
atomic_inc(&qp->q.refcnt);
write_unlock(&ip4_frags.lock);
qp_in->q.last_in |= COMPLETE;
- ipq_put(qp_in, NULL);
+ ipq_put(qp_in);
return qp;
}
}
@@ -664,7 +664,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
ret = ip_frag_queue(qp, skb);
spin_unlock(&qp->q.lock);
- ipq_put(qp, NULL);
+ ipq_put(qp);
return ret;
}