From owner-cvs-all@FreeBSD.ORG  Fri Jun 18 05:10:54 2004
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 4B95F16A4CE; Fri, 18 Jun 2004 05:10:54 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 29B2443D45; Fri, 18 Jun 2004 05:10:54 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5I59gV0022403;
	Fri, 18 Jun 2004 05:09:42 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5I59gbn022402;
	Fri, 18 Jun 2004 05:09:42 GMT
	(envelope-from rwatson)
Message-Id: <200406180509.i5I59gbn022402@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 18 Jun 2004 05:09:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/netgraph/bluetooth/socket ng_btsocket_rfcomm.c
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, 18 Jun 2004 05:10:54 -0000

rwatson     2004-06-18 05:09:42 UTC

  FreeBSD src repository

  Modified files:
    sys/netgraph/bluetooth/socket ng_btsocket_rfcomm.c 
  Log:
  Correct merge-o: make sure to unlock symmetrically socket buffer
  locks on bluetooth sockets when clearing upcall flags.
  
  Submitted by:   emax
  
  Revision  Changes    Path
  1.12      +2 -2      src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c