patch-2.4.0-test3 linux/net/ipv6/udp.c

• Lines: 27
• Date: Sun Jul 9 22:30:41 2000
• Orig file: v2.4.0-test2/linux/net/ipv6/udp.c
• Orig date: Thu May 11 15:30:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/net/ipv6/udp.c linux/net/ipv6/udp.c
@@ -7,7 +7,7 @@
  *
  *	Based on linux/ipv4/udp.c
  *
- *	$Id: udp.c,v 1.53 2000/05/03 06:37:07 davem Exp $
+ *	$Id: udp.c,v 1.55 2000/07/08 00:20:43 davem Exp $
  *
  *	Fixes:
  *	Hideaki YOSHIFUJI	:	sin6_scope_id support
@@ -400,7 +400,7 @@
 	if (err)
 		goto out_free;
 
-	sk->stamp=skb->stamp;
+	sock_recv_timestamp(msg, sk, skb);
 
 	/* Copy the address. */
 	if (msg->msg_name) {
@@ -868,6 +868,8 @@
 
 	fl.proto = IPPROTO_UDP;
 	fl.fl6_dst = daddr;
+	if (fl.fl6_src == NULL && !ipv6_addr_any(&np->saddr))
+		fl.fl6_src = &np->saddr;
 	fl.uli_u.ports.dport = udh.uh.dest;
 	fl.uli_u.ports.sport = udh.uh.source;