diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 1 | ||||
-rw-r--r-- | net/ipv6/reassembly.c | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index bff63d79c6..25746d3150 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -686,7 +686,6 @@ int nf_ct_frag6_init(void) | |||
686 | nf_frags.skb_free = nf_skb_free; | 686 | nf_frags.skb_free = nf_skb_free; |
687 | nf_frags.qsize = sizeof(struct nf_ct_frag6_queue); | 687 | nf_frags.qsize = sizeof(struct nf_ct_frag6_queue); |
688 | nf_frags.match = ip6_frag_match; | 688 | nf_frags.match = ip6_frag_match; |
689 | nf_frags.equal = ip6_frag_equal; | ||
690 | nf_frags.frag_expire = nf_ct_frag6_expire; | 689 | nf_frags.frag_expire = nf_ct_frag6_expire; |
691 | inet_frags_init(&nf_frags); | 690 | inet_frags_init(&nf_frags); |
692 | 691 | ||
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 11fffe791f..01766bc75b 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 | } |