net/ipv6: Pass skb to route lookup

[linux-2.6-block.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 869e2e6750f7a791c019adfbef76ae29916cfb44..1124f310df5ae6addd1ea479b2a00da46d0b7db9 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -679,7 +679,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
                /* Try to guess incoming interface */
                rt = rt6_lookup(dev_net(skb->dev), &ipv6_hdr(skb2)->saddr,
-                               NULL, 0, 0);
+                               NULL, 0, skb2, 0);
 
                if (rt && rt->dst.dev)
                        skb2->dev = rt->dst.dev;
@@ -1444,7 +1444,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)
 
                struct rt6_info *rt = rt6_lookup(t->net,
                                                 &p->raddr, &p->laddr,
-                                                p->link, strict);
+                                                p->link, NULL, strict);
 
                if (!rt)
                        return;