kernel.git/net/ipv6/sit.c, branch linux-2.6.28.y

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-06-17T01:25:48Z

Conflicts: drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c net/sctp/protocol.c

ipv6 sit: Avoid extra need for compat layer in PRL management.

2008-06-16T23:48:20Z

We've introduced extra need of compat layer for ip_tunnel_prl{} for PRL (Potential Router List) management. Though compat_ioctl is still missing in ipv4/ipv6, let's make the interface more straight-forward and eliminate extra need for nasty compat layer anyway since the interface is new for 2.6.26. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller

net: remove CVS keywords

2008-06-12T04:00:38Z

This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-05-26T06:26:10Z

Conflicts: drivers/net/cpmac.c net/mac80211/mlme.c

net: The world is not perfect patch.

2008-05-22T00:47:54Z

Unless there will be any objection here, I suggest consider the following patch which simply removes the code for the -DI_WISH_WORLD_WERE_PERFECT in the three methods which use it. The compilation errors we get when using -DI_WISH_WORLD_WERE_PERFECT show that this code was not built and not used for really a long time. Signed-off-by: Rami Rosen Signed-off-by: David S. Miller

sit: Use on-device stats instead of private ones.

2008-05-21T21:15:46Z

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

sit: Add missing kfree_skb() on pskb_may_pull() failure.

2008-05-09T06:40:26Z

Noticed by Paul Marks . Signed-off-by: David S. Miller

[SIT]: Allow to create SIT tunnels in net namespaces.

2008-04-16T08:17:18Z

Set proper net and mark a new device as NETNS_LOCAL before registering. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[SIT]: Use proper net in routing calls.

2008-04-16T08:16:58Z

I.e. replace init_net stubs in ip_route_output_key() calls. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[SIT]: Make tunnels hashes per-net.

2008-04-16T08:16:38Z

Just move all the hashes on the sit_net structure and patch the rest of the code appropriately. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller