aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-04 13:23:54 +0100
committerMark Brown <broonie@linaro.org>2014-04-08 19:51:30 +0100
commitc114eb1c2973f47f9eec02ddfe9955c333483014 (patch)
treef0146bfb07b8de8e4fd7eaef11decb8b9d1cc443
parent943550a24c51bdd971f579200f286241548deaf7 (diff)
downloadlinux-linaro-stable-c114eb1c2973f47f9eec02ddfe9955c333483014.tar.gz
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>
-rw-r--r--include/net/ping.h2
-rw-r--r--net/ipv6/ping.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ping.h b/include/net/ping.h
index 9242fa090d3d..2db4860e5848 100644
--- 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 858788da5a2f..e2cc17cd1cfd 100644
--- 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;
}