Date: Thu, 31 Jul 2014 09:18:29 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269328 - head/sys/netinet Message-ID: <201407310918.s6V9IThb072231@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Thu Jul 31 09:18:29 2014 New Revision: 269328 URL: http://svnweb.freebsd.org/changeset/base/269328 Log: Only check error if one could have been generated Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Thu Jul 31 09:18:15 2014 (r269327) +++ head/sys/netinet/in.c Thu Jul 31 09:18:29 2014 (r269328) @@ -418,20 +418,22 @@ in_aifaddr_ioctl(u_long cmd, caddr_t dat LIST_INSERT_HEAD(INADDR_HASH(ia->ia_addr.sin_addr.s_addr), ia, ia_hash); IN_IFADDR_WUNLOCK(); - if (vhid != 0) + if (vhid != 0) { error = (*carp_attach_p)(&ia->ia_ifa, vhid); - if (error) - goto fail1; + if (error) + goto fail1; + } /* * Give the interface a chance to initialize * if this is its first address, * and to validate the address if necessary. */ - if (ifp->if_ioctl != NULL) + if (ifp->if_ioctl != NULL) { error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia); - if (error) - goto fail2; + if (error) + goto fail2; + } /* * Add route for the network.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407310918.s6V9IThb072231>