linux.git/net/ipv6/ip6_gre.c, branch v3.14.41

ipv6: gre: fix wrong skb->protocol in WCCP

2014-12-16T17:34:27+00:00

[ Upstream commit be6572fdb1bfbe23b2624d477de50af50b02f5d6 ]

When using GRE redirection in WCCP, it sets the wrong skb->protocol,
that is, ETH_P_IP instead of ETH_P_IPV6 for the encapuslated traffic.

Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Cc: Dmitry Kozlov 
Signed-off-by: Yuri Chislov 
Tested-by: Yuri Chislov 
Signed-off-by: Daniel Borkmann 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

gre6: Move the setting of dev->iflink into the ndo_init functions.

2014-11-21T17:23:00+00:00

[ Upstream commit f03eb128e3f4276f46442d14f3b8f864f3775821 ]

Otherwise it gets overwritten by register_netdev().

Signed-off-by: Steffen Klassert 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ip6_gre: fix flowi6_proto value in xmit path

2014-10-15T06:36:42+00:00

[ Upstream commit 3be07244b7337760a3269d56b2f4a63e72218648 ]

In xmit path, we build a flowi6 which will be used for the output route lookup.
We are sending a GRE packet, neither IPv4 nor IPv6 encapsulated packet, thus the
protocol should be IPPROTO_GRE.

Fixes: c12b395a4664 ("gre: Support GRE over IPv6")
Reported-by: Matthieu Ternisien d'Ouville 
Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ip6_gre: don't allow to remove the fb_tunnel_dev

2014-05-31T20:20:34+00:00

[ Upstream commit 54d63f787b652755e66eb4dd8892ee6d3f5197fc ]

It's possible to remove the FB tunnel with the command 'ip link del ip6gre0' but
this is unsafe, the module always supposes that this device exists. For example,
ip6gre_tunnel_lookup() may use it unconditionally.

Let's add a rtnl handler for dellink, which will never remove the FB tunnel (we
let ip6gre_destroy_tunnels() do the job).

Introduced by commit c12b395a4664 ("gre: Support GRE over IPv6").

CC: Dmitry Kozlov 
Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipv6: move IPV6_TCLASS_SHIFT into ipv6.h and define a helper

2014-01-15T23:53:18+00:00

Two places defined IPV6_TCLASS_SHIFT, so we should move it into ipv6.h,
and use this macro as possible. And define ip6_tclass helper to return
tclass

Signed-off-by: Li RongQing 
Signed-off-by: David S. Miller

net: unify the pcpu_tstats and br_cpu_netstats as one

2014-01-05T01:10:24+00:00

They are same, so unify them as one, pcpu_sw_netstats.

Define pcpu_sw_netstat in netdevice.h, remove pcpu_tstats
from if_tunnel and remove br_cpu_netstats from br_private.h

Cc: Cong Wang 
Cc: Stephen Hemminger 
Signed-off-by: Li RongQing 
Signed-off-by: David S. Miller

ipv6: add ip6_flowlabel helper

2013-12-10T02:03:49+00:00

And use it if possible.

Signed-off-by: Florent Fourcot 
Reviewed-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

ipv6: move IPV6_TCLASS_MASK definition in ipv6.h

2013-12-10T02:03:49+00:00

Signed-off-by: Florent Fourcot 
Reviewed-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

net: Explicitly initialize u64_stats_sync structures for lockdep

2013-11-06T11:40:25+00:00

In order to enable lockdep on seqcount/seqlock structures, we
must explicitly initialize any locks.

The u64_stats_sync structure, uses a seqcount, and thus we need
to introduce a u64_stats_init() function and use it to initialize
the structure.

This unfortunately adds a lot of fairly trivial initialization code
to a number of drivers. But the benefit of ensuring correctness makes
this worth while.

Because these changes are required for lockdep to be enabled, and the
changes are quite trivial, I've not yet split this patch out into 30-some
separate patches, as I figured it would be better to get the various
maintainers thoughts on how to best merge this change along with
the seqcount lockdep enablement.

Feedback would be appreciated!

Signed-off-by: John Stultz 
Acked-by: Julian Anastasov 
Signed-off-by: Peter Zijlstra 
Cc: Alexey Kuznetsov 
Cc: "David S. Miller" 
Cc: Eric Dumazet 
Cc: Hideaki YOSHIFUJI 
Cc: James Morris 
Cc: Jesse Gross 
Cc: Mathieu Desnoyers 
Cc: "Michael S. Tsirkin" 
Cc: Mirko Lindner 
Cc: Patrick McHardy 
Cc: Roger Luethi 
Cc: Rusty Russell 
Cc: Simon Horman 
Cc: Stephen Hemminger 
Cc: Steven Rostedt 
Cc: Thomas Petazzoni 
Cc: Wensong Zhang 
Cc: netdev@vger.kernel.org
Link: http://lkml.kernel.org/r/1381186321-4906-2-git-send-email-john.stultz@linaro.org
Signed-off-by: Ingo Molnar

ipv6: Initialize ip6_tnl.hlen in gre tunnel even if no route is found

2013-10-11T21:50:59+00:00

The ip6_tnl.hlen (gre and ipv6 headers length) is independent from the
outgoing interface, so it would be better to initialize it even when no
route is found, otherwise its value will be zero.
While I'm not sure if this could happen in real life, but doing that
will avoid to call the skb_push function with a zero in ip6gre_header
function.

Suggested-by: Hannes Frederic Sowa 
Signed-off-by: Oussama Ghorbel 
Acked-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller