diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-15 11:46:35 +0000 |
| commit | 598911b42c940158caa1169092a804903bde845e (patch) | |
| tree | 15487a73d3854488ef679ee920c48fe1a90c28b3 /net/ipv6/raw.c | |
| parent | 1eb72f0b98fe7ea1c4bb2e9e294a865b044b2a82 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-598911b42c940158caa1169092a804903bde845e.tar.gz linux-598911b42c940158caa1169092a804903bde845e.tar.xz | |
Merge tag 'v3.13-rc4' into regulator-pfuze100
Linux 3.13-rc4
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index e24ff1df0401..b6bb87e55805 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -466,10 +466,10 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, return -EOPNOTSUPP; if (flags & MSG_ERRQUEUE) - return ipv6_recv_error(sk, msg, len); + return ipv6_recv_error(sk, msg, len, addr_len); if (np->rxpmtu && np->rxopt.bits.rxpmtu) - return ipv6_recv_rxpmtu(sk, msg, len); + return ipv6_recv_rxpmtu(sk, msg, len, addr_len); skb = skb_recv_datagram(sk, flags, noblock, &err); if (!skb) @@ -792,7 +792,6 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, flowlabel = fl6_sock_lookup(sk, fl6.flowlabel); if (flowlabel == NULL) return -EINVAL; - daddr = &flowlabel->dst; } } |