svn commit: r258417 - user/ae/inet6/sys/net

Andrey V. Elsukov ae at FreeBSD.org
Thu Nov 21 03:01:29 UTC 2013


Author: ae
Date: Thu Nov 21 03:01:28 2013
New Revision: 258417
URL: http://svnweb.freebsd.org/changeset/base/258417

Log:
  Since we keep sin6_scope_id initialized, there is no need to recover it.

Modified:
  user/ae/inet6/sys/net/if_gif.c

Modified: user/ae/inet6/sys/net/if_gif.c
==============================================================================
--- user/ae/inet6/sys/net/if_gif.c	Thu Nov 21 02:54:58 2013	(r258416)
+++ user/ae/inet6/sys/net/if_gif.c	Thu Nov 21 03:01:28 2013	(r258417)
@@ -830,13 +830,6 @@ gif_ioctl(ifp, cmd, data)
 		if (src->sa_len > size)
 			return EINVAL;
 		bcopy((caddr_t)src, (caddr_t)dst, src->sa_len);
-#ifdef INET6
-		if (dst->sa_family == AF_INET6) {
-			error = sa6_recoverscope((struct sockaddr_in6 *)dst);
-			if (error != 0)
-				return (error);
-		}
-#endif
 		break;
 			
 	case SIOCGIFPDSTADDR:
@@ -875,13 +868,6 @@ gif_ioctl(ifp, cmd, data)
 		if (error != 0)
 			return (error);
 		bcopy((caddr_t)src, (caddr_t)dst, src->sa_len);
-#ifdef INET6
-		if (dst->sa_family == AF_INET6) {
-			error = sa6_recoverscope((struct sockaddr_in6 *)dst);
-			if (error != 0)
-				return (error);
-		}
-#endif
 		break;
 
 	case SIOCSIFFLAGS:


More information about the svn-src-user mailing list