ip_generic_getfrag, udplite_getfrag: switch to passing msghdr

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/net/udplite.h b/include/net/udplite.h
index 9a28a51..d5baaba 100644 (file)
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -19,7 +19,8 @@ extern struct udp_table               udplite_table;
 static __inline__ int udplite_getfrag(void *from, char *to, int  offset,
                                      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 */

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/l2tp/l2tp_ip6.c
Simple merge