Date: Tue, 9 Jun 2009 08:09:30 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193815 - head/sys/net Message-ID: <200906090809.n5989Ue9061384@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906090809.n5989Ue9061384>