From owner-svn-src-projects@FreeBSD.ORG Tue May 26 17:43:32 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B34F106564A; Tue, 26 May 2009 17:43:32 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69F808FC20; Tue, 26 May 2009 17:43:32 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4QHhWF3067151; Tue, 26 May 2009 17:43:32 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4QHhW1d067150; Tue, 26 May 2009 17:43:32 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200905261743.n4QHhW1d067150@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 26 May 2009 17:43:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192821 - projects/mips/sys/mips/atheros X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 May 2009 17:43:32 -0000 Author: gonzo Date: Tue May 26 17:43:32 2009 New Revision: 192821 URL: http://svn.freebsd.org/changeset/base/192821 Log: - arge_poll should be decalred only if DEVICE_POLLING is enabled - Revert Rx buffer nsegments from BUS_SPACE_UNRESTRICTED to ARGE_MAXFRAGS Modified: projects/mips/sys/mips/atheros/if_arge.c Modified: projects/mips/sys/mips/atheros/if_arge.c ============================================================================== --- projects/mips/sys/mips/atheros/if_arge.c Tue May 26 17:06:36 2009 (r192820) +++ projects/mips/sys/mips/atheros/if_arge.c Tue May 26 17:43:32 2009 (r192821) @@ -103,7 +103,9 @@ static void arge_reset_dma(struct arge_s static int arge_resume(device_t); static int arge_rx_ring_init(struct arge_softc *); static int arge_tx_ring_init(struct arge_softc *); +#ifdef DEVICE_POLLING static void arge_poll(struct ifnet *, enum poll_cmd, int); +#endif static void arge_shutdown(device_t); static void arge_start(struct ifnet *); static void arge_start_locked(struct ifnet *); @@ -1086,7 +1088,7 @@ arge_dma_alloc(struct arge_softc *sc) BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ MCLBYTES, /* maxsize */ - BUS_SPACE_UNRESTRICTED, /* nsegments */ + ARGE_MAXFRAGS, /* nsegments */ MCLBYTES, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockarg */