7 files changed, 12 insertions, 18 deletions

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index a9ff97c120c7..89e3c53c8886 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -73,9 +73,6 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
                                                  struct net_device *dev,
                                                  int strict);
 
-extern int                      ipv6_get_saddr(struct dst_entry *dst, 
-                                               struct in6_addr *daddr,
-                                               struct in6_addr *saddr);
 extern int                      ipv6_dev_get_saddr(struct net_device *dev, 
                                                struct in6_addr *daddr,
                                                struct in6_addr *saddr);
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 18e3a9825d81..9b3a2d0e4269 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1167,14 +1167,7 @@ record_it:
         return 0;
 }
 
-
-int ipv6_get_saddr(struct dst_entry *dst,
-                   struct in6_addr *daddr, struct in6_addr *saddr)
-{
-        return ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL, daddr, saddr);
-}
-
-EXPORT_SYMBOL(ipv6_get_saddr);
+EXPORT_SYMBOL(ipv6_dev_get_saddr);
 
 int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
                     unsigned char banned_flags)
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 695c0ca8a417..157db3a1ce00 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -85,8 +85,8 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
                 if ((rule->flags & FIB_RULE_FIND_SADDR) &&
                     r->src.plen && !(flags & RT6_LOOKUP_F_HAS_SADDR)) {
                         struct in6_addr saddr;
-                        if (ipv6_get_saddr(&rt->u.dst, &flp->fl6_dst,
-                                           &saddr))
+                        if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+                                               &flp->fl6_dst, &saddr))
                                 goto again;
                         if (!ipv6_prefix_equal(&saddr, &r->src.addr,
                                                r->src.plen))
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index a59d259cf97e..ff3971173e1e 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -919,7 +919,8 @@ static int ip6_dst_lookup_tail(struct sock *sk,
                 goto out_err_release;
 
         if (ipv6_addr_any(&fl->fl6_src)) {
-                err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src);
+                err = ipv6_dev_get_saddr(ip6_dst_idev(*dst)->dev,
+                                         &fl->fl6_dst, &fl->fl6_src);
                 if (err)
                         goto out_err_release;
         }
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1b15e1708409..6abe7da45ef7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2122,7 +2122,8 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
                 NLA_PUT_U32(skb, RTA_IIF, iif);
         else if (dst) {
                 struct in6_addr saddr_buf;
-                if (ipv6_get_saddr(&rt->u.dst, dst, &saddr_buf) == 0)
+                if (ipv6_dev_get_saddr(ip6_dst_idev(&rt->u.dst)->dev,
+                                       dst, &saddr_buf) == 0)
                         NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
         }
 
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 7d20199ee1f3..6ef56303e69e 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -57,8 +57,9 @@ static int xfrm6_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
         if (IS_ERR(dst))
                 return -EHOSTUNREACH;
 
-        ipv6_get_saddr(dst, (struct in6_addr *)&daddr->a6,
-                       (struct in6_addr *)&saddr->a6);
+        ipv6_dev_get_saddr(ip6_dst_idev(dst)->dev,
+                           (struct in6_addr *)&daddr->a6,
+                           (struct in6_addr *)&saddr->a6);
         dst_release(dst);
         return 0;
 }
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 87f940587d5f..3e4878800b36 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -313,7 +313,8 @@ static void sctp_v6_get_saddr(struct sctp_association *asoc,
                           __FUNCTION__, asoc, dst, NIP6(daddr->v6.sin6_addr));
 
         if (!asoc) {
-                ipv6_get_saddr(dst, &daddr->v6.sin6_addr,&saddr->v6.sin6_addr);
+                ipv6_dev_get_saddr(dst ? ip6_dst_idev(dst)->dev : NULL,
+                                   &daddr->v6.sin6_addr, &saddr->v6.sin6_addr);
                 SCTP_DEBUG_PRINTK("saddr from ipv6_get_saddr: " NIP6_FMT "\n",
                                   NIP6(saddr->v6.sin6_addr));
                 return;