linux-toradex.git/net/ipv4/inet_fragment.c, branch v2.6.24.4

[INET]: Consolidate frag queues freeing

2007-10-18T02:48:26+00:00

Since we now allocate the queues in inet_fragment.c, we
can safely free it in the same place. The ->destructor
callback thus becomes optional for inet_frags.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Remove no longer needed ->equal callback

2007-10-18T02:47:56+00:00

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 
Signed-off-by: David S. Miller

[INET]: Consolidate xxx_find() in fragment management

2007-10-18T02:47:21+00:00

Here we need another callback ->match to check whether the
entry found in hash matches the key passed. The key used 
is the same as the creation argument for inet_frag_create.

Yet again, this ->match is the same for netfilter and ipv6.
Running a frew steps forward - this callback will later
replace the ->equal one.

Since the inet_frag_find() uses the already consolidated
inet_frag_create() remove the xxx_frag_create from protocol
codes.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate xxx_frag_create()

2007-10-18T02:46:47+00:00

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 
Signed-off-by: David S. Miller

[INET]: Consolidate xxx_frag_alloc()

2007-10-18T02:45:23+00:00

Just perform the kzalloc() allocation and setup common
fields in the inet_frag_queue(). Then return the result
to the caller to initialize the rest.

The inet_frag_alloc() may return NULL, so check the 
return value before doing the container_of(). This looks 
ugly, but the xxx_frag_alloc() will be removed soon.

The xxx_expire() timer callbacks are patches, 
because the argument is now the inet_frag_queue, not 
the protocol specific queue.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate xxx_frag_intern

2007-10-18T02:44:34+00:00

This routine checks for the existence of a given entry
in the hash table and inserts the new one if needed.

The ->equal callback is used to compare two frag_queue-s
together, but this one is temporary and will be removed
later. The netfilter code and the ipv6 one use the same
routine to compare frags.

The inet_frag_intern() always returns non-NULL pointer,
so convert the inet_frag_queue into protocol specific
one (with the container_of) without any checks.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate the xxx_evictor

2007-10-15T19:26:42+00:00

The evictors collect some statistics for ipv4 and ipv6,
so make it return the number of evicted queues and account
them all at once in the caller.

The XXX_ADD_STATS_BH() macros are just for this case,
but maybe there are places in code, that can make use of
them as well.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate the xxx_frag_destroy

2007-10-15T19:26:42+00:00

To make in possible we need to know the exact frag queue
size for inet_frags->mem management and two callbacks:

 * to destoy the skb (optional, used in conntracks only)
 * to free the queue itself (mandatory, but later I plan to
   move the allocation and the destruction of frag_queues
   into the common place, so this callback will most likely
   be optional too).

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate xxx_the secret_rebuild

2007-10-15T19:26:41+00:00

This code works with the generic data types as well, so
move this into inet_fragment.c

This move makes it possible to hide the secret_timer
management and the secret_rebuild routine completely in
the inet_fragment.c

Introduce the ->hashfn() callback in inet_frags() to get
the hashfun for a given inet_frag_queue() object.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller

[INET]: Consolidate the xxx_frag_kill

2007-10-15T19:26:41+00:00

Since now all the xxx_frag_kill functions now work
with the generic inet_frag_queue data type, this can
be moved into a common place.

The xxx_unlink() code is moved as well.

Signed-off-by: Pavel Emelyanov 
Signed-off-by: David S. Miller