aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-24 13:23:40 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-09 16:28:22 -0500
commitf69e6d131f5dac8278ac79a902cc448364880d8b (patch)
tree10349e4876756e6dd3382ee2db9158f7bd54b0d8 /net/ipv6
parent19e3c66b52caf20a9a1119dc847b6abae4c03f4f (diff)
ip_generic_getfrag, udplite_getfrag: switch to passing msghdr
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/raw.c2
-rw-r--r--net/ipv6/udp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 942f67b91274..11a9283fda51 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -727,7 +727,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd,
727 727
728 offset -= rfv->hlen; 728 offset -= rfv->hlen;
729 729
730 return ip_generic_getfrag(rfv->msg->msg_iov, to, offset, len, odd, skb); 730 return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb);
731} 731}
732 732
733static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, 733static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 7f96432292ce..189dc4ae3eca 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1312,7 +1312,7 @@ do_append_data:
1312 dontfrag = np->dontfrag; 1312 dontfrag = np->dontfrag;
1313 up->len += ulen; 1313 up->len += ulen;
1314 getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag; 1314 getfrag = is_udplite ? udplite_getfrag : ip_generic_getfrag;
1315 err = ip6_append_data(sk, getfrag, msg->msg_iov, ulen, 1315 err = ip6_append_data(sk, getfrag, msg, ulen,
1316 sizeof(struct udphdr), hlimit, tclass, opt, &fl6, 1316 sizeof(struct udphdr), hlimit, tclass, opt, &fl6,
1317 (struct rt6_info *)dst, 1317 (struct rt6_info *)dst,
1318 corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag); 1318 corkreq ? msg->msg_flags|MSG_MORE : msg->msg_flags, dontfrag);