diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-04 13:27:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-08 19:51:32 +0100 |
| commit | 4fa5ed96f83f09e4a04ff5555a2a7e205364d75d (patch) | |
| tree | 298c958b7526991dff8c3999ee8a2d13570e5918 /net/ipv6/raw.c | |
| parent | c114eb1c2973f47f9eec02ddfe9955c333483014 (diff) | |
net: ipv6: Fix ipv6_recv_error signaturev3.10/topic/aosp-warnings
When the ipv6 ping code was backported the code appears to have been
cherry picked from upstream without adjusting the signature of
ipv6_recv_error(). In upstream and in the cherry pick the final addr_len
parameter has been dropped but the v3.10 definition had this argument.
Adjust the definition and all callers to follow the upstream pattern.
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 464b1c9c08e4..dff1f4b2c668 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -459,8 +459,10 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, if (flags & MSG_OOB) return -EOPNOTSUPP; - if (flags & MSG_ERRQUEUE) - return ipv6_recv_error(sk, msg, len, addr_len); + if (flags & MSG_ERRQUEUE) { + *addr_len = sizeof(struct sockaddr_in6); + return ipv6_recv_error(sk, msg, len); + } if (np->rxpmtu && np->rxopt.bits.rxpmtu) return ipv6_recv_rxpmtu(sk, msg, len, addr_len); |