summaryrefslogtreecommitdiff
path: root/include/net/ping.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-06-06 02:56:43 +0400
committerDavid S. Miller <davem@davemloft.net>2013-06-06 03:37:30 +0400
commit6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2 (patch)
tree8b049ef383307f5dae91b5c9cf78dbfb9b74a4d1 /include/net/ping.h
parent11a164a04382d735230b01f4cc46ad78a7c4abf6 (diff)
parent4d3797d7e1861ac1af150a6189315786c5e1c820 (diff)
downloadlinux-6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches that will build on top of them. This merge commit includes a change from Emil Goode (emilgoode@gmail.com) that fixes a warning that would have been introduced by this merge. Specifically it fixes the pingv6_ops method ipv6_chk_addr() to add a "const" to the "struct net_device *dev" argument and likewise update the dummy_ipv6_chk_addr() declaration. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ping.h')
-rw-r--r--include/net/ping.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ping.h b/include/net/ping.h
index db04802f1673..5db0224b73ac 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 {