linux.git/net/ipv4/af_inet.c, branch v2.6.30

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

2009-03-27T16:28:43+00:00

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar

net: convert usage of packet_type to read_mostly

2009-03-10T12:22:43+00:00

Protocols that use packet_type can be __read_mostly section for better
locality. Elminate any unnecessary initializations of NULL.

Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

alloc_percpu: add align argument to __alloc_percpu.

2009-02-20T07:29:08+00:00

This prepares for a real __alloc_percpu, by adding an alignment argument.
Only one place uses __alloc_percpu directly, and that's for a string.

tj: af_inet also uses __alloc_percpu(), update it.

Signed-off-by: Rusty Russell 
Cc: Christoph Lameter 
Cc: Jens Axboe

gro: Optimise IPv4 packet reception

2009-02-09T04:22:19+00:00

As this function can be called more than half a million times for
10GbE, it's important to optimise it as much as we can.

This patch does some obvious changes to use 2-byte and 4-byte
operations instead of byte-oriented ones where possible.  Bit
ops are also used to replace logical ops to reduce branching.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

ipv4: Delete redundant sk_family assignment

2009-02-02T06:24:43+00:00

sk_alloc now sets sk_family so this is redundant.  In fact it caught
my eye because sock_init_data already uses sk_family so this is too
late anyway.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

net: replace uses of __constant_{endian}

2009-02-01T08:45:17+00:00

Base versions handle constant folding now.

Signed-off-by: Harvey Harrison 
Signed-off-by: David S. Miller

gro: Avoid copying headers of unmerged packets

2009-01-30T00:33:03+00:00

Unfortunately simplicity isn't always the best.  The fraginfo
interface turned out to be suboptimal.  The problem was quite
obvious.  For every packet, we have to copy the headers from
the frags structure into skb->head, even though for 99% of the
packets this part is immediately thrown away after the merge.

LRO didn't have this problem because it directly read the headers
from the frags structure.

This patch attempts to address this by creating an interface
that allows GRO to access the headers in the first frag without
having to copy it.  Because all drivers that use frags place the
headers in the first frag this optimisation should be enough.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

netns: igmp: allow IPPROTO_IGMP sockets in netns

2008-12-26T00:42:23+00:00

Looks like everything is already ready.

Required for ebtables(8) for one thing.

Also, required for ipmr per-netns (coming soon). (Benjamin)

Signed-off-by: Alexey Dobriyan 
Acked-by: Benjamin Thery 
Signed-off-by: David S. Miller

tcp: Add GRO support

2008-12-16T07:43:36+00:00

This patch adds the TCP-specific portion of GRO.  The criterion for
merging is extremely strict (the TCP header must match exactly apart
from the checksum) so as to allow refragmentation.  Otherwise this
is pretty much identical to LRO, except that we support the merging
of ECN packets.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

ipv4: Add GRO infrastructure

2008-12-16T07:41:09+00:00

This patch adds GRO support for IPv4.

The criteria for merging is more stringent than LRO, in particular,
we require all fields in the IP header to be identical except for
the length, ID and checksum.  In addition, the ID must form an
arithmetic sequence with a difference of one.

The ID requirement might seem overly strict, however, most hardware
TSO solutions already obey this rule.  Linux itself also obeys this
whether GSO is in use or not.

In future we could relax this rule by storing the IDs (or rather
making sure that we don't drop them when pulling the aggregate
skb's tail).

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller