11 files changed, 17 insertions, 15 deletions

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index e0caed25bfba..0e2895c8b270 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -43,7 +43,8 @@ extern struct rt6_info	*ip6_blk_hole_entry;
 
 extern void                     ip6_route_input(struct sk_buff *skb);
 
-extern struct dst_entry *       ip6_route_output(struct sock *sk,
+extern struct dst_entry *       ip6_route_output(struct net *net,
+                                                 struct sock *sk,
                                                  struct flowi *fl);
 
 extern int                      ip6_route_init(void);
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index cff74127ea32..d4c4b50420d8 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -178,7 +178,7 @@ static inline int icmpv6_xrlim_allow(struct sock *sk, int type,
          * XXX: perhaps the expire for routing entries cloned by
          * this lookup should be more aggressive (not longer than timeout).
          */
-        dst = ip6_route_output(sk, fl);
+        dst = ip6_route_output(&init_net, sk, fl);
         if (dst->error) {
                 IP6_INC_STATS(ip6_dst_idev(dst),
                               IPSTATS_MIB_OUTNOROUTES);
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index ff3971173e1e..161afd1142d0 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -913,7 +913,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
         int err;
 
         if (*dst == NULL)
-                *dst = ip6_route_output(sk, fl);
+                *dst = ip6_route_output(&init_net, sk, fl);
 
         if ((err = (*dst)->error))
                 goto out_err_release;
@@ -954,7 +954,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
                                 dst_release(*dst);
                                 memcpy(&fl_gw, fl, sizeof(struct flowi));
                                 memset(&fl_gw.fl6_dst, 0, sizeof(struct in6_addr));
-                                *dst = ip6_route_output(sk, &fl_gw);
+                                *dst = ip6_route_output(&init_net, sk, &fl_gw);
                                 if ((err = (*dst)->error))
                                         goto out_err_release;
                         }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 4e1981660b3c..1e1ad1ed87e6 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -847,7 +847,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
         if ((dst = ip6_tnl_dst_check(t)) != NULL)
                 dst_hold(dst);
         else {
-                dst = ip6_route_output(NULL, fl);
+                dst = ip6_route_output(&init_net, NULL, fl);
 
                 if (dst->error || xfrm_lookup(&dst, fl, NULL, 0) < 0)
                         goto tx_err_link_failure;
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index f1c95125100d..b5b4fd173e98 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1427,7 +1427,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
         icmpv6_flow_init(ndisc_socket->sk, &fl, NDISC_REDIRECT,
                          &saddr_buf, &ipv6_hdr(skb)->saddr, dev->ifindex);
 
-        dst = ip6_route_output(NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl);
         if (dst == NULL)
                 return;
 
diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c
index 2e06724dc348..aed51bcc66b4 100644
--- a/net/ipv6/netfilter.c
+++ b/net/ipv6/netfilter.c
@@ -23,7 +23,7 @@ int ip6_route_me_harder(struct sk_buff *skb)
                     .saddr = iph->saddr, } },
         };
 
-        dst = ip6_route_output(skb->sk, &fl);
+        dst = ip6_route_output(&init_net, skb->sk, &fl);
 
 #ifdef CONFIG_XFRM
         if (!(IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED) &&
@@ -86,7 +86,7 @@ static int nf_ip6_reroute(struct sk_buff *skb,
 
 static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl)
 {
-        *dst = ip6_route_output(NULL, fl);
+        *dst = ip6_route_output(&init_net, NULL, fl);
         return (*dst)->error;
 }
 
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index b23baa635fe0..831708aeab37 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -93,7 +93,7 @@ static void send_reset(struct sk_buff *oldskb)
         fl.fl_ip_sport = otcph.dest;
         fl.fl_ip_dport = otcph.source;
         security_skb_classify_flow(oldskb, &fl);
-        dst = ip6_route_output(NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl);
         if (dst == NULL)
                 return;
         if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0))
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index ec1fedb339cc..f31d7dc11e72 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -772,7 +772,8 @@ static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table
         return ip6_pol_route(net, table, fl->oif, fl, flags);
 }
 
-struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
+struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
+                                    struct flowi *fl)
 {
         int flags = 0;
 
@@ -782,7 +783,7 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl)
         if (!ipv6_addr_any(&fl->fl6_src))
                 flags |= RT6_LOOKUP_F_HAS_SADDR;
 
-        return fib6_rule_lookup(&init_net, fl, flags, ip6_pol_route_output);
+        return fib6_rule_lookup(net, fl, flags, ip6_pol_route_output);
 }
 
 EXPORT_SYMBOL(ip6_route_output);
@@ -2260,7 +2261,7 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void
         skb_reset_mac_header(skb);
         skb_reserve(skb, MAX_HEADER + sizeof(struct ipv6hdr));
 
-        rt = (struct rt6_info*) ip6_route_output(NULL, &fl);
+        rt = (struct rt6_info*) ip6_route_output(&init_net, NULL, &fl);
         skb->dst = &rt->u.dst;
 
         err = rt6_fill_node(skb, rt, &fl.fl6_dst, &fl.fl6_src, iif,
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 68720aa63f96..1b8196c8d145 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -393,7 +393,7 @@ isatap_srcok(struct sk_buff *skb, struct iphdr *iph, struct net_device *dev)
         fl.oif = dev->ifindex;
         security_skb_classify_flow(skb, &fl);
 
-        dst = ip6_route_output(NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl);
         if (!dst->error && (dst->dev == dev) && (neigh = dst->neighbour)) {
 
                 addr6 = (struct in6_addr*)&neigh->primary_key;
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 6ef56303e69e..e96dafdc7032 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -38,7 +38,7 @@ static struct dst_entry *xfrm6_dst_lookup(int tos, xfrm_address_t *saddr,
         if (saddr)
                 memcpy(&fl.fl6_src, saddr, sizeof(fl.fl6_src));
 
-        dst = ip6_route_output(NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl);
 
         err = dst->error;
         if (dst->error) {
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 3e4878800b36..4862835b0c39 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -257,7 +257,7 @@ static struct dst_entry *sctp_v6_get_dst(struct sctp_association *asoc,
                         NIP6(fl.fl6_src));
         }
 
-        dst = ip6_route_output(NULL, &fl);
+        dst = ip6_route_output(&init_net, NULL, &fl);
         if (!dst->error) {
                 struct rt6_info *rt;
                 rt = (struct rt6_info *)dst;