From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Sun, 18 Aug 2013 11:47:01 +0000 (+0200)
Subject: xfrm: choose protocol family by skb protocol
X-Git-Tag: v3.11~4^2~9^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=844d48746e4b281a933aedc0428048a1219b42f4;p=pandora-kernel.git

xfrm: choose protocol family by skb protocol

We need to choose the protocol family by skb->protocol. Otherwise we
call the wrong xfrm{4,6}_local_error handler in case an ipv6 sockets is
used in ipv4 mode, in which case we should call down to xfrm4_local_error
(ip6 sockets are a superset of ip4 ones).

We are called before before ip_output functions, so skb->protocol is
not reset.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

Reading git-diff-tree failed