diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-27 19:30:51 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-04 01:34:13 -0500 |
| commit | 7ae9abfd9d6f3216500fc2874254e726cc30ca01 (patch) | |
| tree | 94dad8a0102d9d483010cd874d552bec9944ecb7 | |
| parent | a8866ff6a5bce7d0ec465a63bc482a85c09b0d39 (diff) | |
| download | linux-7ae9abfd9d6f3216500fc2874254e726cc30ca01.tar.bz2 | |
ipv4: raw_send_hdrinc(): pass msghdr
Switch from passing msg->iov_iter.iov to passing msg itself
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | net/ipv4/raw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 0bb68df5055d..2c9d252072a2 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -337,7 +337,7 @@ int raw_rcv(struct sock *sk, struct sk_buff *skb) } static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, - void *from, size_t length, + struct msghdr *msg, size_t length, struct rtable **rtp, unsigned int flags) { @@ -382,7 +382,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, skb->transport_header = skb->network_header; err = -EFAULT; - if (memcpy_fromiovecend((void *)iph, from, 0, length)) + if (memcpy_fromiovecend((void *)iph, msg->msg_iter.iov, 0, length)) goto error_free; iphlen = iph->ihl * 4; @@ -625,8 +625,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, back_from_confirm: if (inet->hdrincl) - /* XXX: stripping const */ - err = raw_send_hdrinc(sk, &fl4, (struct iovec *)msg->msg_iter.iov, len, + err = raw_send_hdrinc(sk, &fl4, msg, len, &rt, msg->msg_flags); else { |