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/ipv6/reassembly.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/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 11fffe791fc4..01766bc75b6a 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -143,18 +143,6 @@ static unsigned int ip6_hashfn(struct inet_frag_queue *q) | |||
143 | return ip6qhashfn(fq->id, &fq->saddr, &fq->daddr); | 143 | return ip6qhashfn(fq->id, &fq->saddr, &fq->daddr); |
144 | } | 144 | } |
145 | 145 | ||
146 | int ip6_frag_equal(struct inet_frag_queue *q1, struct inet_frag_queue *q2) | ||
147 | { | ||
148 | struct frag_queue *fq1, *fq2; | ||
149 | |||
150 | fq1 = container_of(q1, struct frag_queue, q); | ||
151 | fq2 = container_of(q2, struct frag_queue, q); | ||
152 | return (fq1->id == fq2->id && | ||
153 | ipv6_addr_equal(&fq2->saddr, &fq1->saddr) && | ||
154 | ipv6_addr_equal(&fq2->daddr, &fq1->daddr)); | ||
155 | } | ||
156 | EXPORT_SYMBOL(ip6_frag_equal); | ||
157 | |||
158 | int ip6_frag_match(struct inet_frag_queue *q, void *a) | 146 | int ip6_frag_match(struct inet_frag_queue *q, void *a) |
159 | { | 147 | { |
160 | struct frag_queue *fq; | 148 | struct frag_queue *fq; |
@@ -661,7 +649,6 @@ void __init ipv6_frag_init(void) | |||
661 | ip6_frags.skb_free = NULL; | 649 | ip6_frags.skb_free = NULL; |
662 | ip6_frags.qsize = sizeof(struct frag_queue); | 650 | ip6_frags.qsize = sizeof(struct frag_queue); |
663 | ip6_frags.match = ip6_frag_match; | 651 | ip6_frags.match = ip6_frag_match; |
664 | ip6_frags.equal = ip6_frag_equal; | ||
665 | ip6_frags.frag_expire = ip6_frag_expire; | 652 | ip6_frags.frag_expire = ip6_frag_expire; |
666 | inet_frags_init(&ip6_frags); | 653 | inet_frags_init(&ip6_frags); |
667 | } | 654 | } |