diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ping.c | 3 | ||||
-rw-r--r-- | net/ipv6/raw.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 5b7a1ed2aba9..2d3148378a1f 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c | |||
@@ -163,7 +163,8 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
163 | pfh.icmph.checksum = 0; | 163 | pfh.icmph.checksum = 0; |
164 | pfh.icmph.un.echo.id = inet->inet_sport; | 164 | pfh.icmph.un.echo.id = inet->inet_sport; |
165 | pfh.icmph.un.echo.sequence = user_icmph.icmp6_sequence; | 165 | pfh.icmph.un.echo.sequence = user_icmph.icmp6_sequence; |
166 | pfh.iov = msg->msg_iov; | 166 | /* XXX: stripping const */ |
167 | pfh.iov = (struct iovec *)msg->msg_iter.iov; | ||
167 | pfh.wcheck = 0; | 168 | pfh.wcheck = 0; |
168 | pfh.family = AF_INET6; | 169 | pfh.family = AF_INET6; |
169 | 170 | ||
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 11a9283fda51..ee25631f8c29 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -886,7 +886,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, | |||
886 | 886 | ||
887 | back_from_confirm: | 887 | back_from_confirm: |
888 | if (inet->hdrincl) | 888 | if (inet->hdrincl) |
889 | err = rawv6_send_hdrinc(sk, msg->msg_iov, len, &fl6, &dst, msg->msg_flags); | 889 | /* XXX: stripping const */ |
890 | err = rawv6_send_hdrinc(sk, (struct iovec *)msg->msg_iter.iov, len, &fl6, &dst, msg->msg_flags); | ||
890 | else { | 891 | else { |
891 | lock_sock(sk); | 892 | lock_sock(sk); |
892 | err = ip6_append_data(sk, raw6_getfrag, &rfv, | 893 | err = ip6_append_data(sk, raw6_getfrag, &rfv, |