kernel/linux.git/include/net/ip.h, branch linux-2.6.18.y

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20T22:10:08+00:00

* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add to headers included for userspace in Move inclusion of out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include and use __uXX types in Use __uXX types in , include too Remove private struct dx_hash_info from public view in Include and use __uXX types in Use __uXX types in for struct divert_blk et al. Use __u32 for elf_addr_t in , not u32. It's user-visible. Remove PPP_FCS from user view in , remove __P mess entirely Use __uXX types in user-visible structures in Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of from Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h

[NET]: net.ipv4.ip_autoconfig sysctl removal

2006-06-18T04:30:30+00:00

The sysctl net.ipv4.ip_autoconfig is a legacy value that is not used. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller

Don't include linux/config.h from anywhere else in include/

2006-04-26T11:56:16+00:00

Signed-off-by: David Woodhouse

[NETFILTER]: Fix fragmentation issues with bridge netfilter

2006-04-10T05:25:23+00:00

The conntrack code doesn't do re-fragmentation of defragmented packets anymore but relies on fragmentation in the IP layer. Purely bridged packets don't pass through the IP layer, so the bridge netfilter code needs to take care of fragmentation itself. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

[NET]: {get|set}sockopt compatibility layer

2006-03-21T06:45:21+00:00

This patch extends {get|set}sockopt compatibility layer in order to move protocol specific parts to their place and avoid huge universal net/compat.c file in the future. Signed-off-by: Dmitry Mishin Signed-off-by: David S. Miller

[XFRM]: Fix SNAT-related crash in xfrm4_output_finish

2006-02-15T23:10:22+00:00

When a packet matching an IPsec policy is SNATed so it doesn't match any policy anymore it looses its xfrm bundle, which makes xfrm4_output_finish crash because of a NULL pointer dereference. This patch directs these packets to the original output path instead. Since the packets have already passed the POST_ROUTING hook, but need to start at the beginning of the original output path which includes another POST_ROUTING invocation, a flag is added to the IPCB to indicate that the packet was rerouted and doesn't need to pass the POST_ROUTING hook again. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

[IPV4]: make ip_fragment() static

2006-01-07T21:23:39+00:00

Since there's no longer any external user of ip_fragment() we can make it static. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller

[NETFILTER]: Fix xfrm lookup in ip_route_me_harder/ip6_route_me_harder

2006-01-07T20:57:33+00:00

ip_route_me_harder doesn't use the port numbers of the xfrm lookup and uses ip_route_input for non-local addresses which doesn't do a xfrm lookup, ip6_route_me_harder doesn't do a xfrm lookup at all. Use xfrm_decode_session and do the lookup manually, make sure both only do the lookup if the packet hasn't been transformed already. Makeing sure the lookup only happens once needs a new field in the IP6CB, which exceeds the size of skb->cb. The size of skb->cb is increased to 48b. Apparently the IPv6 mobile extensions need some more room anyway. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

[IPV4]: reset IPCB flags when neccessary

2006-01-07T20:57:32+00:00

Reset IPSKB_XFRM_TUNNEL_SIZE flags in ipip and ip_gre hard_start_xmit function before the packet reenters IP. This is neccessary so the encapsulated packets are checked not to be oversized in xfrm4_output.c again. Reset all flags in sit when a packet changes its address family. Also remove some obsolete IPSKB flags. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller

[NETFILTER]: Call POST_ROUTING hook before fragmentation

2006-01-05T20:20:59+00:00

Call POST_ROUTING hook before fragmentation to get rid of the okfn use in ip_refrag and save the useless fragmentation/defragmentation step when NAT is used. The patch introduces one user-visible change, the POSTROUTING chain in the mangle table gets entire packets, not fragments, which should simplify use of the MARK and CLASSIFY targets for queueing as a nice side-effect. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller