From owner-cvs-src@FreeBSD.ORG Sun Aug 31 16:27:49 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E30C71065682; Sun, 31 Aug 2008 16:27:49 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5AE58FC0C; Sun, 31 Aug 2008 16:27:49 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VGRnVr065229; Sun, 31 Aug 2008 16:27:49 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VGRnuV065228; Sun, 31 Aug 2008 16:27:49 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200808311627.m7VGRnuV065228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Sun, 31 Aug 2008 16:27:37 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/netinet6 ip6_output.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2008 16:27:50 -0000 rwatson 2008-08-31 16:27:37 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet6 ip6_output.c Log: SVN rev 182549 on 2008-08-31 16:27:37Z by rwatson Merge r180957 from head to stable/7: Marginally decomplicate set/getsockopt code in ip6_output.c by simply using the passed arguments explicitly and unconditionally rather than testing them and calling panic(). The result is the same but easier to read. Revision Changes Path 1.109.2.7 +11 -18 src/sys/netinet6/ip6_output.c