diff options
| author | James Wylder <jwylder@motorola.com> | 2014-02-28 11:52:19 -0600 |
|---|---|---|
| committer | James Wylder <jwylder@motorola.com> | 2014-03-05 17:46:47 -0600 |
| commit | 32fd2d36d2464056d4522a9c02797b7c2b2e884f (patch) | |
| tree | b4e3e58495f46966de07e338c5ea62439f74073b | |
| parent | 7107ec7f3ecf770e3616cacad400a34515949c5f (diff) | |
| download | olio-linux-3.10-32fd2d36d2464056d4522a9c02797b7c2b2e884f.tar.xz olio-linux-3.10-32fd2d36d2464056d4522a9c02797b7c2b2e884f.zip | |
IKXCLOCK-380 net: ipv6: ipv6_chk_addr parameter types
ipv6_chk_addr takes a const struct net_device *. Update
references to compile cleanly.
Signed-off-by: James Wylder <jwylder@motorola.com>
| -rw-r--r-- | include/net/ping.h | 2 | ||||
| -rw-r--r-- | net/ipv6/ping.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ping.h b/include/net/ping.h index 9242fa090d3..2db4860e584 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 858788da5a2..e2cc17cd1cf 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; } |