aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_fragment.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-17 22:47:56 -0400
committerDavid S. Miller <davem@davemloft.net>2007-10-17 22:47:56 -0400
commit48d60056387c37a17a46feda48613587a90535e5 (patch)
tree8e7e481c6cf8b28c124c1e5902092d2bd53dbf7b /net/ipv4/ip_fragment.c
parentabd6523d15f40bfee14652619a31a7f65f77f581 (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/ip_fragment.c')
-rw-r--r--net/ipv4/ip_fragment.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 928259dbc0f8..314593b20506 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -128,20 +128,6 @@ static unsigned int ip4_hashfn(struct inet_frag_queue *q)
128 return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol); 128 return ipqhashfn(ipq->id, ipq->saddr, ipq->daddr, ipq->protocol);
129} 129}
130 130
131static int ip4_frag_equal(struct inet_frag_queue *q1,
132 struct inet_frag_queue *q2)
133{
134 struct ipq *qp1, *qp2;
135
136 qp1 = container_of(q1, struct ipq, q);
137 qp2 = container_of(q2, struct ipq, q);
138 return (qp1->id == qp2->id &&
139 qp1->saddr == qp2->saddr &&
140 qp1->daddr == qp2->daddr &&
141 qp1->protocol == qp2->protocol &&
142 qp1->user == qp2->user);
143}
144
145static int ip4_frag_match(struct inet_frag_queue *q, void *a) 131static int ip4_frag_match(struct inet_frag_queue *q, void *a)
146{ 132{
147 struct ipq *qp; 133 struct ipq *qp;
@@ -631,7 +617,6 @@ void __init ipfrag_init(void)
631 ip4_frags.destructor = ip4_frag_free; 617 ip4_frags.destructor = ip4_frag_free;
632 ip4_frags.skb_free = NULL; 618 ip4_frags.skb_free = NULL;
633 ip4_frags.qsize = sizeof(struct ipq); 619 ip4_frags.qsize = sizeof(struct ipq);
634 ip4_frags.equal = ip4_frag_equal;
635 ip4_frags.match = ip4_frag_match; 620 ip4_frags.match = ip4_frag_match;
636 ip4_frags.frag_expire = ip_expire; 621 ip4_frags.frag_expire = ip_expire;
637 inet_frags_init(&ip4_frags); 622 inet_frags_init(&ip4_frags);