patch-2.3.15 linux/net/ipv6/datagram.c

• Lines: 31
• Date: Mon Aug 23 10:01:02 1999
• Orig file: v2.3.14/linux/net/ipv6/datagram.c
• Orig date: Thu Apr 22 19:45:20 1999

diff -u --recursive --new-file v2.3.14/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.17 1999/04/22 10:07:40 davem Exp $
+ *	$Id: datagram.c,v 1.18 1999/08/20 11:06:17 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -158,7 +158,7 @@
 			ipv6_addr_set(&sin->sin6_addr, 0, 0,
 				      __constant_htonl(0xffff),
 				      skb->nh.iph->saddr);
-			if (sk->ip_cmsg_flags)
+			if (sk->protinfo.af_inet.cmsg_flags)
 				ip_cmsg_recv(msg, skb);
 		}
 	}
@@ -269,11 +269,7 @@
 			}
 
 			if (!ipv6_addr_any(&src_info->ipi6_addr)) {
-				struct inet6_ifaddr *ifp;
-
-				ifp = ipv6_chk_addr(&src_info->ipi6_addr, NULL, 0);
-
-				if (ifp == NULL) {
+				if (!ipv6_chk_addr(&src_info->ipi6_addr, NULL)) {
 					err = -EINVAL;
 					goto exit_f;
 				}