Merge branch 'kvm-basic-exit-reason' into HEAD

[linux-2.6-microblaze.git] / net / ipv6 / ip6_vti.c

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index cc6180e..1147f64 100644 (file)
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -296,7 +296,8 @@ static void vti6_dev_uninit(struct net_device *dev)
        dev_put(dev);
 }
 
-static int vti6_rcv(struct sk_buff *skb)
+static int vti6_input_proto(struct sk_buff *skb, int nexthdr, __be32 spi,
+                           int encap_type)
 {
        struct ip6_tnl *t;
        const struct ipv6hdr *ipv6h = ipv6_hdr(skb);
@@ -323,7 +324,10 @@ static int vti6_rcv(struct sk_buff *skb)
 
                rcu_read_unlock();
 
-               return xfrm6_rcv_tnl(skb, t);
+               XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6 = t;
+               XFRM_SPI_SKB_CB(skb)->family = AF_INET6;
+               XFRM_SPI_SKB_CB(skb)->daddroff = offsetof(struct ipv6hdr, daddr);
+               return xfrm_input(skb, nexthdr, spi, encap_type);
        }
        rcu_read_unlock();
        return -EINVAL;
@@ -332,6 +336,13 @@ discard:
        return 0;
 }
 
+static int vti6_rcv(struct sk_buff *skb)
+{
+       int nexthdr = skb_network_header(skb)[IP6CB(skb)->nhoff];
+
+       return vti6_input_proto(skb, nexthdr, 0, 0);
+}
+
 static int vti6_rcv_cb(struct sk_buff *skb, int err)
 {
        unsigned short family;
@@ -1185,6 +1196,7 @@ static struct pernet_operations vti6_net_ops = {
 
 static struct xfrm6_protocol vti_esp6_protocol __read_mostly = {
        .handler        =       vti6_rcv,
+       .input_handler  =       vti6_input_proto,
        .cb_handler     =       vti6_rcv_cb,
        .err_handler    =       vti6_err,
        .priority       =       100,
@@ -1192,6 +1204,7 @@ static struct xfrm6_protocol vti_esp6_protocol __read_mostly = {
 
 static struct xfrm6_protocol vti_ah6_protocol __read_mostly = {
        .handler        =       vti6_rcv,
+       .input_handler  =       vti6_input_proto,
        .cb_handler     =       vti6_rcv_cb,
        .err_handler    =       vti6_err,
        .priority       =       100,
@@ -1199,6 +1212,7 @@ static struct xfrm6_protocol vti_ah6_protocol __read_mostly = {
 
 static struct xfrm6_protocol vti_ipcomp6_protocol __read_mostly = {
        .handler        =       vti6_rcv,
+       .input_handler  =       vti6_input_proto,
        .cb_handler     =       vti6_rcv_cb,
        .err_handler    =       vti6_err,
        .priority       =       100,