From owner-svn-src-head@FreeBSD.ORG Mon May 2 20:43:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FB6F106566C; Mon, 2 May 2011 20:43:24 +0000 (UTC) (envelope-from davidch@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 60B808FC1A; Mon, 2 May 2011 20:43:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p42KhOvI053654; Mon, 2 May 2011 20:43:24 GMT (envelope-from davidch@svn.freebsd.org) Received: (from davidch@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p42KhOcj053651; Mon, 2 May 2011 20:43:24 GMT (envelope-from davidch@svn.freebsd.org) Message-Id: <201105022043.p42KhOcj053651@svn.freebsd.org> From: David Christensen Date: Mon, 2 May 2011 20:43:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221342 - head/sys/dev/bxe X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2011 20:43:24 -0000 Author: davidch Date: Mon May 2 20:43:24 2011 New Revision: 221342 URL: http://svn.freebsd.org/changeset/base/221342 Log: - Re-committed r220603 which was accidentally backed out by an earlier commit. - Fixed a bug in an unused debug macro. MFC after: One week. Modified: head/sys/dev/bxe/bxe_debug.h head/sys/dev/bxe/if_bxe.h Modified: head/sys/dev/bxe/bxe_debug.h ============================================================================== --- head/sys/dev/bxe/bxe_debug.h Mon May 2 20:37:30 2011 (r221341) +++ head/sys/dev/bxe/bxe_debug.h Mon May 2 20:43:24 2011 (r221342) @@ -210,7 +210,7 @@ extern uint32_t bxe_debug; /* Returns FALSE in "defects" per 2^31 - 1 calls, otherwise returns TRUE. */ #define DB_RANDOMFALSE(defects) (random() > defects) #define DB_OR_RANDOMFALSE(defects) || (random() > defects) -#define DB_AND_RANDOMFALSE(defects) && (random() > ddfects) +#define DB_AND_RANDOMFALSE(defects) && (random() > defects) /* Returns TRUE in "defects" per 2^31 - 1 calls, otherwise returns FALSE. */ #define DB_RANDOMTRUE(defects) (random() < defects) Modified: head/sys/dev/bxe/if_bxe.h ============================================================================== --- head/sys/dev/bxe/if_bxe.h Mon May 2 20:37:30 2011 (r221341) +++ head/sys/dev/bxe/if_bxe.h Mon May 2 20:43:24 2011 (r221342) @@ -1150,9 +1150,6 @@ struct bxe_fastpath { /* ToDo: Audit this structure for unused varaibles. */ struct bxe_softc { - /* - * MUST start with ifnet pointer (see definition of miibus_statchg()). - */ struct ifnet *bxe_ifp; int media;