From owner-cvs-src@FreeBSD.ORG  Fri Jun 23 01:15:03 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1F8A716A4A5;
	Fri, 23 Jun 2006 01:15:03 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 97F7243D55;
	Fri, 23 Jun 2006 01:15:02 +0000 (GMT)
	(envelope-from thompsa@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5N1F2dd036813;
	Fri, 23 Jun 2006 01:15:02 GMT
	(envelope-from thompsa@repoman.freebsd.org)
Received: (from thompsa@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5N1F2NW036800;
	Fri, 23 Jun 2006 01:15:02 GMT (envelope-from thompsa)
Message-Id: <200606230115.k5N1F2NW036800@repoman.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Fri, 23 Jun 2006 01:14:57 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/modules/if_bridge Makefile src/sys/net
 if_bridge.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2006 01:15:03 -0000

thompsa     2006-06-23 01:14:57 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/modules/if_bridge Makefile 
    sys/net              if_bridge.c 
  Log:
  MFC: Makefile r1.5; if_bridge.c r1.62
  
   Allow bridge and carp to play nicely together by returning the packet if its
   destined for a carp interface.
  
  Revision   Changes    Path
  1.2.2.2    +1 -1      src/sys/modules/if_bridge/Makefile
  1.11.2.33  +16 -2     src/sys/net/if_bridge.c