patch-2.4.4 linux/net/ipv6/datagram.c
Next file: linux/net/ipv6/exthdrs.c
Previous file: linux/net/ipv6/af_inet6.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Thu Apr 12 12:11:39 2001
- Orig file:
v2.4.3/linux/net/ipv6/datagram.c
- Orig date:
Tue Nov 28 21:53:45 2000
diff -u --recursive --new-file v2.4.3/linux/net/ipv6/datagram.c linux/net/ipv6/datagram.c
@@ -5,7 +5,7 @@
* Authors:
* Pedro Roque <roque@di.fc.ul.pt>
*
- * $Id: datagram.c,v 1.21 2000/11/28 13:42:08 davem Exp $
+ * $Id: datagram.c,v 1.22 2000/12/13 18:31:50 davem Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@
serr->port = port;
skb->h.raw = payload;
- skb_pull(skb, payload - skb->data);
+ __skb_pull(skb, payload - skb->data);
if (sock_queue_err_skb(sk, skb))
kfree_skb(skb);
@@ -92,7 +92,7 @@
serr->port = fl->uli_u.ports.dport;
skb->h.raw = skb->tail;
- skb_pull(skb, skb->tail - skb->data);
+ __skb_pull(skb, skb->tail - skb->data);
if (sock_queue_err_skb(sk, skb))
kfree_skb(skb);
@@ -123,7 +123,7 @@
msg->msg_flags |= MSG_TRUNC;
copied = len;
}
- err = memcpy_toiovec(msg->msg_iov, skb->data, copied);
+ err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
if (err)
goto out_free_skb;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)