Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet6 Simplify.



details:   https://anonhg.NetBSD.org/src/rev/a63522904bc1
branches:  trunk
changeset: 817586:a63522904bc1
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Aug 26 20:29:31 2016 +0000

description:
Simplify.

diffstat:

 sys/netinet6/in6_src.c |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 11e585745ebf -r a63522904bc1 sys/netinet6/in6_src.c
--- a/sys/netinet6/in6_src.c    Fri Aug 26 20:19:45 2016 +0000
+++ b/sys/netinet6/in6_src.c    Fri Aug 26 20:29:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_src.c,v 1.69 2016/08/26 19:45:55 roy Exp $ */
+/*     $NetBSD: in6_src.c,v 1.70 2016/08/26 20:29:31 roy Exp $ */
 /*     $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $     */
 
 /*
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.69 2016/08/26 19:45:55 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.70 2016/08/26 20:29:31 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -245,13 +245,9 @@
 
                _s = pserialize_read_enter();
                ifa = ifa_ifwithaddr(sin6tosa(&srcsock));
-               if (ifa == NULL) {
-                       pserialize_read_exit(_s);
-                       *errorp = EADDRNOTAVAIL;
-                       goto exit;
-               }
-               ia6 = ifatoia6(ifa);
-               if (ia6->ia6_flags & (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY)) {
+               if ((ia6 = ifatoia6(ifa)) == NULL ||
+                   ia6->ia6_flags &
+                   (IN6_IFF_ANYCAST | IN6_IFF_NOTREADY)) {
                        pserialize_read_exit(_s);
                        *errorp = EADDRNOTAVAIL;
                        goto exit;



Home | Main Index | Thread Index | Old Index