From owner-cvs-all@FreeBSD.ORG  Fri Feb 25 17:55:06 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7D2DC16A4CE; Fri, 25 Feb 2005 17:55:06 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4D8B243D2D; Fri, 25 Feb 2005 17:55:06 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1PHt6Fx092150;
	Fri, 25 Feb 2005 17:55:06 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1PHt6mb092149;
	Fri, 25 Feb 2005 17:55:06 GMT
	(envelope-from rwatson)
Message-Id: <200502251755.j1PHt6mb092149@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 25 Feb 2005 17:55:06 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Subject: cvs commit: src/sys/kern uipc_accf.c uipc_socket.c src/sys/sys
 socketvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Feb 2005 17:55:06 -0000

rwatson     2005-02-25 17:55:06 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/kern             uipc_accf.c uipc_socket.c 
    sys/sys              socketvar.h 
  Log:
  Merge uipc_aaccf.c:1.14, uipc_socket.c:1.229, and socketvar.h:1.138 from
  HEAD to RELENG_5:
  
    Move do_setopt_accept_filter() from uipc_socket.c to uipc_accf.c, where
    the rest of the accept filter code currently lives.
  
  Revision    Changes    Path
  1.11.2.3    +120 -0    src/sys/kern/uipc_accf.c
  1.208.2.15  +0 -126    src/sys/kern/uipc_socket.c
  1.133.2.3   +1 -0      src/sys/sys/socketvar.h