From owner-cvs-src@FreeBSD.ORG  Tue Oct 12 10:33:42 2004
Return-Path: <owner-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 6903216A4CF; Tue, 12 Oct 2004 10:33:42 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5AA5343D1D; Tue, 12 Oct 2004 10:33:42 +0000 (GMT)
	(envelope-from glebius@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 i9CAXgVf092111;
	Tue, 12 Oct 2004 10:33:42 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9CAXgb1092110;
	Tue, 12 Oct 2004 10:33:42 GMT
	(envelope-from glebius)
Message-Id: <200410121033.i9CAXgb1092110@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Oct 2004 10:33: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/net bridge.c bridge.h if_ethersubr.c
 src/sys/netgraph ng_ether.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 12 Oct 2004 10:33:42 -0000

glebius     2004-10-12 10:33:42 UTC

  FreeBSD src repository

  Modified files:
    sys/net              bridge.c bridge.h if_ethersubr.c 
    sys/netgraph         ng_ether.c 
  Log:
  Fix packet flow when both ng_ether(4) and bridge(4) are in use:
  
  - push all bridge logic from if_ethersubr.c into bridge.c
    make bridge_in() return mbuf pointer (or NULL).
  - call only bridge_in() from ether_input(), after ng_ether_input()
    was optinally called.
  - call bridge_in() from ng_ether_rcv_upper().
  
  Long description:       http://lists.freebsd.org/mailman/htdig/freebsd-net/2004-May/003881.html
  Reported by:            Jian-Wei Wang <jwwang at FreeBSD.csie.NCTU.edu.tw>
  Tested by:              myself, Sergey Lyubka
  Reviewed by:            sam
  Approved by:            julian (mentor)
  MFC after:              2 months
  
  Revision  Changes    Path
  1.85      +29 -4     src/sys/net/bridge.c
  1.13      +1 -1      src/sys/net/bridge.h
  1.179     +2 -46     src/sys/net/if_ethersubr.c
  1.40      +5 -0      src/sys/netgraph/ng_ether.c