diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-17 22:47:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-10-17 22:47:56 -0400 |
commit | 48d60056387c37a17a46feda48613587a90535e5 (patch) | |
tree | 8e7e481c6cf8b28c124c1e5902092d2bd53dbf7b /net/ipv4/inet_fragment.c | |
parent | abd6523d15f40bfee14652619a31a7f65f77f581 (diff) |
[INET]: Remove no longer needed ->equal callback
Since this callback is used to check for conflicts in
hashtable when inserting a newly created frag queue, we can
do the same by checking for matching the queue with the
argument, used to create one.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
-rw-r--r-- | net/ipv4/inet_fragment.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 6ba98ebbed93..3ed09dd93442 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -174,7 +174,7 @@ int inet_frag_evictor(struct inet_frags *f) | |||
174 | EXPORT_SYMBOL(inet_frag_evictor); | 174 | EXPORT_SYMBOL(inet_frag_evictor); |
175 | 175 | ||
176 | static struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *qp_in, | 176 | static struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *qp_in, |
177 | struct inet_frags *f, unsigned int hash) | 177 | struct inet_frags *f, unsigned int hash, void *arg) |
178 | { | 178 | { |
179 | struct inet_frag_queue *qp; | 179 | struct inet_frag_queue *qp; |
180 | #ifdef CONFIG_SMP | 180 | #ifdef CONFIG_SMP |
@@ -188,7 +188,7 @@ static struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *qp_in, | |||
188 | * promoted read lock to write lock. | 188 | * promoted read lock to write lock. |
189 | */ | 189 | */ |
190 | hlist_for_each_entry(qp, n, &f->hash[hash], list) { | 190 | hlist_for_each_entry(qp, n, &f->hash[hash], list) { |
191 | if (f->equal(qp, qp_in)) { | 191 | if (f->match(qp, arg)) { |
192 | atomic_inc(&qp->refcnt); | 192 | atomic_inc(&qp->refcnt); |
193 | write_unlock(&f->lock); | 193 | write_unlock(&f->lock); |
194 | qp_in->last_in |= COMPLETE; | 194 | qp_in->last_in |= COMPLETE; |
@@ -235,7 +235,7 @@ static struct inet_frag_queue *inet_frag_create(struct inet_frags *f, | |||
235 | if (q == NULL) | 235 | if (q == NULL) |
236 | return NULL; | 236 | return NULL; |
237 | 237 | ||
238 | return inet_frag_intern(q, f, hash); | 238 | return inet_frag_intern(q, f, hash, arg); |
239 | } | 239 | } |
240 | 240 | ||
241 | struct inet_frag_queue *inet_frag_find(struct inet_frags *f, void *key, | 241 | struct inet_frag_queue *inet_frag_find(struct inet_frags *f, void *key, |