net: ipv6: Add missing const to ipv6_chk_addr

The net_device used by ipv6_chk_addr is const in some users so add a
const here, fixing a warning following mainline commit 6bc19fb82d4c05
(Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) from
David S. Miller.

Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/net/ping.h b/include/net/ping.h
index 9242fa090d3dea62b402e49b68da1c10fd635c9d..2db4860e5848def0360395bfb1b2fd0c80b98a47 100644 (file)
--- a/include/net/ping.h
+++ b/include/net/ping.h
@@ -38,7 +38,7 @@ struct pingv6_ops {
        void (*ipv6_icmp_error)(struct sock *sk, struct sk_buff *skb, int err,
                                __be16 port, u32 info, u8 *payload);
        int (*ipv6_chk_addr)(struct net *net, const struct in6_addr *addr,
-                            struct net_device *dev, int strict);
+                            const struct net_device *dev, int strict);
 };
 
 struct ping_table {

diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 858788da5a2fd0bc2cdf6ee8bd3abaf03b995239..e2cc17cd1cfd0214aae137d11fe2e7f7ba00f348 100644 (file)
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -73,7 +73,7 @@ int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
 void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
                            __be16 port, u32 info, u8 *payload) {}
 int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
-                       struct net_device *dev, int strict)
+                       const struct net_device *dev, int strict)
 {
        return 0;
 }