2 files changed, 20 insertions, 2 deletions

diff --git a/include/net/route.h b/include/net/route.h
index 59b0b19205a2..76b08c1affc0 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -118,6 +118,7 @@ extern unsigned short	ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mt
 extern void             ip_rt_send_redirect(struct sk_buff *skb);
 
 extern unsigned         inet_addr_type(__be32 addr);
+extern unsigned         inet_dev_addr_type(const struct net_device *dev, __be32 addr);
 extern void             ip_rt_multicast_event(struct in_device *);
 extern int              ip_rt_ioctl(unsigned int cmd, void __user *arg);
 extern void             ip_rt_get_source(u8 *src, struct rtable *rt);
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index e02aba5fa136..d90b42f3630c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -155,7 +155,12 @@ out:
         return dev;
 }
 
-unsigned inet_addr_type(__be32 addr)
+/*
+ * Find address type as if only "dev" was present in the system. If
+ * on_dev is NULL then all interfaces are taken into consideration.
+ */
+static inline unsigned __inet_dev_addr_type(const struct net_device *dev,
+                                            __be32 addr)
 {
         struct flowi            fl = { .nl_u = { .ip4_u = { .daddr = addr } } };
         struct fib_result       res;
@@ -175,13 +180,24 @@ unsigned inet_addr_type(__be32 addr)
         if (local_table) {
                 ret = RTN_UNICAST;
                 if (!local_table->tb_lookup(local_table, &fl, &res)) {
-                        ret = res.type;
+                        if (!dev || dev == res.fi->fib_dev)
+                                ret = res.type;
                         fib_res_put(&res);
                 }
         }
         return ret;
 }
 
+unsigned int inet_addr_type(__be32 addr)
+{
+        return __inet_dev_addr_type(NULL, addr);
+}
+
+unsigned int inet_dev_addr_type(const struct net_device *dev, __be32 addr)
+{
+       return __inet_dev_addr_type(dev, addr);
+}
+
 /* Given (packet source, input interface) and optional (dst, oif, tos):
    - (main) check, that source is valid i.e. not broadcast or our local
      address.
@@ -940,4 +956,5 @@ void __init ip_fib_init(void)
 }
 
 EXPORT_SYMBOL(inet_addr_type);
+EXPORT_SYMBOL(inet_dev_addr_type);
 EXPORT_SYMBOL(ip_dev_find);