From owner-cvs-all@FreeBSD.ORG Sun Sep 25 20:36:03 2005 Return-Path: X-Original-To: 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 806A016A41F; Sun, 25 Sep 2005 20:36:03 +0000 (GMT) (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 39A6E43D49; Sun, 25 Sep 2005 20:36:03 +0000 (GMT) (envelope-from thompsa@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 j8PKa3s0015311; Sun, 25 Sep 2005 20:36:03 GMT (envelope-from thompsa@repoman.freebsd.org) Received: (from thompsa@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8PKa32l015310; Sun, 25 Sep 2005 20:36:03 GMT (envelope-from thompsa) Message-Id: <200509252036.j8PKa32l015310@repoman.freebsd.org> From: Andrew Thompson Date: Sun, 25 Sep 2005 20:36:03 +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/net if_bridge.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Sep 2005 20:36:03 -0000 thompsa 2005-09-25 20:36:03 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/net if_bridge.c Log: MFC: if_bridge.c, r1.22 > Fix an alignment panic my preserving the 2byte padding (ETHER_ALIGN) on our > copied mbuf, which keeps the IP header 32-bit aligned. This copied mbuf is > reinjected back into ether_input and off to the IP routines. > > Reported and tested by: Peter van Dijk Approved by: re (scottl), mlaier (mentor) Revision Changes Path 1.11.2.11 +1 -1 src/sys/net/if_bridge.c