ipv6: add ipv6_dev_find to stubs

Add ipv6_dev_find to ipv6_stub to allow lookup of net_devices by IPV6
address in net/ipv4/icmp.c.

Signed-off-by: Andreas Roeseler <andreas.a.roeseler@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ipv6_stubs.h b/include/net/ipv6_stubs.h
index 8fce558b5fea3cdcab8b80bc73a0e24d7080efd8..afbce90c44808a954c79eb9ab2eb3d9249701633 100644 (file)
--- a/include/net/ipv6_stubs.h
+++ b/include/net/ipv6_stubs.h
@@ -66,6 +66,8 @@ struct ipv6_stub {
 
        int (*ipv6_fragment)(struct net *net, struct sock *sk, struct sk_buff *skb,
                             int (*output)(struct net *, struct sock *, struct sk_buff *));
+       struct net_device *(*ipv6_dev_find)(struct net *net, const struct in6_addr *addr,
+                                           struct net_device *dev);
 };
 extern const struct ipv6_stub *ipv6_stub __read_mostly;
 

diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index a36626afbc02000bec613db4e2bc613bae099ab4..1d4054bb345b72204179c17b4ebc69e11e3faf53 100644 (file)
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -198,6 +198,12 @@ static int eafnosupport_ipv6_fragment(struct net *net, struct sock *sk, struct s
        return -EAFNOSUPPORT;
 }
 
+static struct net_device *eafnosupport_ipv6_dev_find(struct net *net, const struct in6_addr *addr,
+                                                    struct net_device *dev)
+{
+       return ERR_PTR(-EAFNOSUPPORT);
+}
+
 const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
        .ipv6_dst_lookup_flow = eafnosupport_ipv6_dst_lookup_flow,
        .ipv6_route_input  = eafnosupport_ipv6_route_input,
@@ -209,6 +215,7 @@ const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
        .fib6_nh_init      = eafnosupport_fib6_nh_init,
        .ip6_del_rt        = eafnosupport_ip6_del_rt,
        .ipv6_fragment     = eafnosupport_ipv6_fragment,
+       .ipv6_dev_find     = eafnosupport_ipv6_dev_find,
 };
 EXPORT_SYMBOL_GPL(ipv6_stub);
 

diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3c9bacffc9c30acac1f3e98458992068d3863985..4f7ca5807046ff47aa12e90021a5e7a834d7df95 100644 (file)
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -1032,6 +1032,7 @@ static const struct ipv6_stub ipv6_stub_impl = {
 #endif
        .nd_tbl = &nd_tbl,
        .ipv6_fragment = ip6_fragment,
+       .ipv6_dev_find = ipv6_dev_find,
 };
 
 static const struct ipv6_bpf_stub ipv6_bpf_stub_impl = {