svn commit: r193815 - head/sys/net

Hiroki Sato hrs at FreeBSD.org
Tue Jun 9 08:09:31 UTC 2009


Author: hrs
Date: Tue Jun  9 08:09:30 2009
New Revision: 193815
URL: http://svn.freebsd.org/changeset/base/193815

Log:
  Style fix.
  
  Submitted by:	bz

Modified:
  head/sys/net/if_gif.c

Modified: head/sys/net/if_gif.c
==============================================================================
--- head/sys/net/if_gif.c	Tue Jun  9 07:26:52 2009	(r193814)
+++ head/sys/net/if_gif.c	Tue Jun  9 08:09:30 2009	(r193815)
@@ -912,13 +912,13 @@ gif_ioctl(ifp, cmd, data)
 	case GIFSOPTS:
 		if ((error = priv_check(curthread, PRIV_NET_GIF)) != 0)
 			break;
-		if (!(error = copyin(ifr->ifr_data, &options,
-				sizeof(options)))) {
-			if ((options | GIF_OPTMASK) == GIF_OPTMASK)
-				sc->gif_options = options;
-			else
-				error = EINVAL;
-		}
+		error = copyin(ifr->ifr_data, &options, sizeof(options));
+		if (error)
+			break;
+		if (options & ~GIF_OPTMASK)
+			error = EINVAL;
+		else
+			sc->gif_options = options;
 		break;
 
 	default:


More information about the svn-src-all mailing list