kernel.git/net/ipv4/ip_gre.c, branch linux-2.6.27.y

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

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

2008-05-21T21:14:22Z

Just switch from tunnel->stat to tunnel->dev->stats. The ip_tunnel->stat member itself will be removed after I fix its other users (very soon). Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Allow for IPPROTO_GRE protocol in namespaces.

2008-04-16T08:11:36Z

This one was also disabled by default for sanity. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Allow to create IPGRE tunnels in net namespaces.

2008-04-16T08:11:13Z

I.e. set the proper net and mark as NETNS_LOCAL. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Use proper net in routing calls.

2008-04-16T08:10:44Z

As for the IPIP tunnel, there are some ip_route_output_key() calls in there that require a proper net so give one to them. And a proper net for the __get_dev_by_index hanging around. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Make tunnels hashes per-net.

2008-04-16T08:10:26Z

Very similar to what was done for the IPIP code. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Make the fallback tunnel device per-net.

2008-04-16T08:10:05Z

Everything is prepared for this change now. Create on in init callback, use it over the code and destroy on net exit. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Use proper net in hash-lookup functions.

2008-04-16T08:09:44Z

This is the part#2 of the patch #2 - get the proper net for these functions. This change in a separate patch in order not to get lost in a large previous patch. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller

[GRE]: Add net/gre_net argument to some functions.

2008-04-16T08:09:22Z

The fallback device and hashes are to become per-net, but many code doesn't have anything to get the struct net pointer from. So pass the proper net there with an extra argument. Signed-off-by: Pavel Emelyanov Signed-off-by: David S. Miller