ip_generic_getfrag, udplite_getfrag: switch to passing msghdr
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>hifive-unleashed-5.1
parent
19e3c66b52
commit
f69e6d131f
|
@ -19,7 +19,8 @@ extern struct udp_table udplite_table;
|
||||||
static __inline__ int udplite_getfrag(void *from, char *to, int offset,
|
static __inline__ int udplite_getfrag(void *from, char *to, int offset,
|
||||||
int len, int odd, struct sk_buff *skb)
|
int len, int odd, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
return memcpy_fromiovecend(to, (struct iovec *) from, offset, len);
|
struct msghdr *msg = from;
|
||||||
|
return memcpy_fromiovecend(to, msg->msg_iov, offset, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Designate sk as UDP-Lite socket */
|
/* Designate sk as UDP-Lite socket */
|
||||||
|
|
|
@ -752,14 +752,14 @@ EXPORT_SYMBOL(ip_fragment);
|
||||||
int
|
int
|
||||||
ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb)
|
ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct iovec *iov = from;
|
struct msghdr *msg = from;
|
||||||
|
|
||||||
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
if (skb->ip_summed == CHECKSUM_PARTIAL) {
|
||||||
if (memcpy_fromiovecend(to, iov, offset, len) < 0)
|
if (memcpy_fromiovecend(to, msg->msg_iov, offset, len) < 0)
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
} else {
|
} else {
|
||||||
__wsum csum = 0;
|
__wsum csum = 0;
|
||||||
if (csum_partial_copy_fromiovecend(to, iov, offset, len, &csum) < 0)
|
if (csum_partial_copy_fromiovecend(to, msg->msg_iov, offset, len, &csum) < 0)
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
skb->csum = csum_block_add(skb->csum, csum, odd);
|
skb->csum = csum_block_add(skb->csum, csum, odd);
|
||||||
}
|
}
|
||||||
|
|
|
@ -478,7 +478,7 @@ static int raw_getfrag(void *from, char *to, int offset, int len, int odd,
|
||||||
|
|
||||||
offset -= rfv->hlen;
|
offset -= rfv->hlen;
|
||||||
|
|
||||||
return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);
|
return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
||||||
|
|
|
@ -1049,7 +1049,7 @@ back_from_confirm:
|
||||||
|
|
||||||
/* Lockless fast path for the non-corking case. */
|
/* Lockless fast path for the non-corking case. */
|
||||||
if (!corkreq) {
|
if (!corkreq) {
|
||||||
skb = ip_make_skb(sk, fl4, getfrag, msg->msg_iov, ulen,
|
skb = ip_make_skb(sk, fl4, getfrag, msg, ulen,
|
||||||
sizeof(struct udphdr), &ipc, &rt,
|
sizeof(struct udphdr), &ipc, &rt,
|
||||||
msg->msg_flags);
|
msg->msg_flags);
|
||||||
err = PTR_ERR(skb);
|
err = PTR_ERR(skb);
|
||||||
|
@ -1080,7 +1080,7 @@ back_from_confirm:
|
||||||
|
|
||||||
do_append_data:
|
do_append_data:
|
||||||
up->len += ulen;
|
up->len += ulen;
|
||||||
err = ip_append_data(sk, fl4, getfrag, msg->msg_iov, ulen,
|
err = ip_append_data(sk, fl4, getfrag, msg, ulen,
|
||||||
sizeof(struct udphdr), &ipc, &rt,
|
sizeof(struct udphdr), &ipc, &rt,
|
||||||
corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);
|
corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags);
|
||||||
if (err)
|
if (err)
|
||||||
|
|
|
@ -727,7 +727,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,
|
||||||
|
|
||||||
offset -= rfv->hlen;
|
offset -= rfv->hlen;
|
||||||
|
|
||||||
return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb);
|
return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
||||||
|
|
|
@ -1312,7 +1312,7 @@ do_append_data:
|
||||||
dontfrag = np->dontfrag;
|
dontfrag = np->dontfrag;
|
||||||
up->len += ulen;
|
up->len += ulen;
|
||||||
getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
|
getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
|
||||||
err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen,
|
err = ip6_append_data(sk, getfrag, msg, ulen,
|
||||||
sizeof(struct udphdr), hlimit, tclass, opt, &fl6,
|
sizeof(struct udphdr), hlimit, tclass, opt, &fl6,
|
||||||
(struct rt6_info *)dst,
|
(struct rt6_info *)dst,
|
||||||
corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag);
|
corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag);
|
||||||
|
|
|
@ -619,7 +619,7 @@ static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
||||||
|
|
||||||
back_from_confirm:
|
back_from_confirm:
|
||||||
lock_sock(sk);
|
lock_sock(sk);
|
||||||
err = ip6_append_data(sk, ip_generic_getfrag, msg->msg_iov,
|
err = ip6_append_data(sk, ip_generic_getfrag, msg,
|
||||||
ulen, transhdrlen, hlimit, tclass, opt,
|
ulen, transhdrlen, hlimit, tclass, opt,
|
||||||
&fl6, (struct rt6_info *)dst,
|
&fl6, (struct rt6_info *)dst,
|
||||||
msg->msg_flags, dontfrag);
|
msg->msg_flags, dontfrag);
|
||||||
|
|
Loading…
Reference in New Issue