svn commit: r238222 - head/sys/netinet6

Bjoern A. Zeeb bz at FreeBSD.org
Sun Jul 8 08:49:38 UTC 2012


Author: bz
Date: Sun Jul  8 08:49:37 2012
New Revision: 238222
URL: http://svn.freebsd.org/changeset/base/238222

Log:
  As mentioned in the commit message of r237571 (copied from a prototype
  patch of mine) also check if the 2nd in6_setscope() failed and return
  the error in that case.
  
  MFC after:	5 days

Modified:
  head/sys/netinet6/in6.c

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Sun Jul  8 00:52:54 2012	(r238221)
+++ head/sys/netinet6/in6.c	Sun Jul  8 08:49:37 2012	(r238222)
@@ -1367,7 +1367,9 @@ in6_purgeaddr_mc(struct ifnet *ifp, stru
 		sin6.sin6_family = AF_INET6;
 		memcpy(&sin6.sin6_addr, &satosin6(ifa0->ifa_addr)->sin6_addr, 
 		    sizeof(sin6.sin6_addr));
-		in6_setscope(&sin6.sin6_addr, ifa0->ifa_ifp, NULL);
+		error = in6_setscope(&sin6.sin6_addr, ifa0->ifa_ifp, NULL);
+		if (error != 0)
+			return (error);
 	}
 
 	rt = in6_rtalloc1((struct sockaddr *)&mltaddr, 0, 0UL, RT_DEFAULT_FIB);


More information about the svn-src-all mailing list