aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-17 22:46:47 -0400
committerDavid S. Miller <davem@davemloft.net>2007-10-17 22:46:47 -0400
commitc6fda282294da882f8d8cc4c513940277dd380f5 (patch)
tree29ef5fbc59320851c8db28e7f2c0a8c3fd85c231 /net/ipv4
parente521db9d790aaa60ae8920e21cb7faedc280fc36 (diff)
[INET]: Consolidate xxx_frag_create()
This one uses the xxx_frag_intern() and xxx_frag_alloc() routines, which are already consolidated, so remove them from protocol code (as promised). The ->constructor callback is used to init the rest of the frag queue and it is the same for netfilter and ipv6. 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/inet_fragment.c20
-rw-r--r--net/ipv4/ip_fragment.c54
2 files changed, 44 insertions, 30 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index 57e15fa307dc..b531f803cda4 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -173,7 +173,7 @@ int inet_frag_evictor(struct inet_frags *f)
173} 173}
174EXPORT_SYMBOL(inet_frag_evictor); 174EXPORT_SYMBOL(inet_frag_evictor);
175 175
176struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *qp_in, 176static 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)
178{ 178{
179 struct inet_frag_queue *qp; 179 struct inet_frag_queue *qp;
@@ -208,9 +208,8 @@ struct inet_frag_queue *inet_frag_intern(struct inet_frag_queue *qp_in,
208 write_unlock(&f->lock); 208 write_unlock(&f->lock);
209 return qp; 209 return qp;
210} 210}
211EXPORT_SYMBOL(inet_frag_intern);
212 211
213struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f) 212static struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f, void *arg)
214{ 213{
215 struct inet_frag_queue *q; 214 struct inet_frag_queue *q;
216 215
@@ -218,6 +217,7 @@ struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f)
218 if (q == NULL) 217 if (q == NULL)
219 return NULL; 218 return NULL;
220 219
220 f->constructor(q, arg);
221 atomic_add(f->qsize, &f->mem); 221 atomic_add(f->qsize, &f->mem);
222 setup_timer(&q->timer, f->frag_expire, (unsigned long)q); 222 setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
223 spin_lock_init(&q->lock); 223 spin_lock_init(&q->lock);
@@ -225,4 +225,16 @@ struct inet_frag_queue *inet_frag_alloc(struct inet_frags *f)
225 225
226 return q; 226 return q;
227} 227}
228EXPORT_SYMBOL(inet_frag_alloc); 228
229struct inet_frag_queue *inet_frag_create(struct inet_frags *f, void *arg,
230 unsigned int hash)
231{
232 struct inet_frag_queue *q;
233
234 q = inet_frag_alloc(f, arg);
235 if (q == NULL)
236 return NULL;
237
238 return inet_frag_intern(q, f, hash);
239}
240EXPORT_SYMBOL(inet_frag_create);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index fc0d530df522..0d6cff1de5a3 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -108,6 +108,11 @@ int ip_frag_mem(void)
108static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, 108static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
109 struct net_device *dev); 109 struct net_device *dev);
110 110
111struct ip4_create_arg {
112 struct iphdr *iph;
113 u32 user;
114};
115
111static unsigned int ipqhashfn(__be16 id, __be32 saddr, __be32 daddr, u8 prot) 116static unsigned int ipqhashfn(__be16 id, __be32 saddr, __be32 daddr, u8 prot)
112{ 117{
113 return jhash_3words((__force u32)id << 16 | prot, 118 return jhash_3words((__force u32)id << 16 | prot,
@@ -146,6 +151,20 @@ static __inline__ void frag_kfree_skb(struct sk_buff *skb, int *work)
146 kfree_skb(skb); 151 kfree_skb(skb);
147} 152}
148 153
154static void ip4_frag_init(struct inet_frag_queue *q, void *a)
155{
156 struct ipq *qp = container_of(q, struct ipq, q);
157 struct ip4_create_arg *arg = a;
158
159 qp->protocol = arg->iph->protocol;
160 qp->id = arg->iph->id;
161 qp->saddr = arg->iph->saddr;
162 qp->daddr = arg->iph->daddr;
163 qp->user = arg->user;
164 qp->peer = sysctl_ipfrag_max_dist ?
165 inet_getpeer(arg->iph->saddr, 1) : NULL;
166}
167
149static __inline__ void ip4_frag_free(struct inet_frag_queue *q) 168static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
150{ 169{
151 struct ipq *qp; 170 struct ipq *qp;
@@ -156,14 +175,6 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q)
156 kfree(qp); 175 kfree(qp);
157} 176}
158 177
159static __inline__ struct ipq *frag_alloc_queue(void)
160{
161 struct inet_frag_queue *q;
162
163 q = inet_frag_alloc(&ip4_frags);
164 return q ? container_of(q, struct ipq, q) : NULL;
165}
166
167 178
168/* Destruction primitives. */ 179/* Destruction primitives. */
169 180
@@ -226,30 +237,20 @@ out:
226 237
227/* Creation primitives. */ 238/* Creation primitives. */
228 239
229static struct ipq *ip_frag_intern(struct ipq *qp_in, unsigned int hash)
230{
231 struct inet_frag_queue *q;
232
233 q = inet_frag_intern(&qp_in->q, &ip4_frags, hash);
234 return container_of(q, struct ipq, q);
235}
236
237/* Add an entry to the 'ipq' queue for a newly received IP datagram. */ 240/* Add an entry to the 'ipq' queue for a newly received IP datagram. */
238static struct ipq *ip_frag_create(struct iphdr *iph, u32 user, unsigned int h) 241static struct ipq *ip_frag_create(struct iphdr *iph, u32 user, unsigned int h)
239{ 242{
240 struct ipq *qp; 243 struct inet_frag_queue *q;
244 struct ip4_create_arg arg;
241 245
242 if ((qp = frag_alloc_queue()) == NULL) 246 arg.iph = iph;
243 goto out_nomem; 247 arg.user = user;
244 248
245 qp->protocol = iph->protocol; 249 q = inet_frag_create(&ip4_frags, &arg, h);
246 qp->id = iph->id; 250 if (q == NULL)
247 qp->saddr = iph->saddr; 251 goto out_nomem;
248 qp->daddr = iph->daddr;
249 qp->user = user;
250 qp->peer = sysctl_ipfrag_max_dist ? inet_getpeer(iph->saddr, 1) : NULL;
251 252
252 return ip_frag_intern(qp, h); 253 return container_of(q, struct ipq, q);
253 254
254out_nomem: 255out_nomem:
255 LIMIT_NETDEBUG(KERN_ERR "ip_frag_create: no memory left !\n"); 256 LIMIT_NETDEBUG(KERN_ERR "ip_frag_create: no memory left !\n");
@@ -642,6 +643,7 @@ void __init ipfrag_init(void)
642{ 643{
643 ip4_frags.ctl = &ip4_frags_ctl; 644 ip4_frags.ctl = &ip4_frags_ctl;
644 ip4_frags.hashfn = ip4_hashfn; 645 ip4_frags.hashfn = ip4_hashfn;
646 ip4_frags.constructor = ip4_frag_init;
645 ip4_frags.destructor = ip4_frag_free; 647 ip4_frags.destructor = ip4_frag_free;
646 ip4_frags.skb_free = NULL; 648 ip4_frags.skb_free = NULL;
647 ip4_frags.qsize = sizeof(struct ipq); 649 ip4_frags.qsize = sizeof(struct ipq);