[IPV6]: Unify ip6_onlink() and ipip6_onlink().

Both are identical, let's create ipv6_chk_prefix() and use it
in both places.

1 files changed, 1 insertions, 26 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 08a483a8de50..cc16fe07bbff 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -344,31 +344,6 @@ out:
         return 0;
 }
 
-/* copied directly from anycast.c */
-static int
-ipip6_onlink(struct in6_addr *addr, struct net_device *dev)
-{
-        struct inet6_dev        *idev;
-        struct inet6_ifaddr     *ifa;
-        int     onlink;
-
-        onlink = 0;
-        rcu_read_lock();
-        idev = __in6_dev_get(dev);
-        if (idev) {
-                read_lock_bh(&idev->lock);
-                for (ifa=idev->addr_list; ifa; ifa=ifa->if_next) {
-                        onlink = ipv6_prefix_equal(addr, &ifa->addr,
-                                                   ifa->prefix_len);
-                        if (onlink)
-                                break;
-                }
-                read_unlock_bh(&idev->lock);
-        }
-        rcu_read_unlock();
-        return onlink;
-}
-
 static int
 isatap_chksrc(struct sk_buff *skb, struct iphdr *iph, struct ip_tunnel *t)
 {
@@ -386,7 +361,7 @@ isatap_chksrc(struct sk_buff *skb, struct iphdr *iph, struct ip_tunnel *t)
                 struct in6_addr *addr6 = &ipv6_hdr(skb)->saddr;
                 if (ipv6_addr_is_isatap(addr6) &&
                     (addr6->s6_addr32[3] == iph->saddr) &&
-                    ipip6_onlink(addr6, t->dev))
+                    ipv6_chk_prefix(addr6, t->dev))
                         skb->ndisc_nodetype = NDISC_NODETYPE_HOST;
                 else
                         ok = 0;