From owner-svn-src-stable-7@FreeBSD.ORG Thu Oct 16 08:24:02 2008 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E313F1065694; Thu, 16 Oct 2008 08:24:02 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D09978FC1D; Thu, 16 Oct 2008 08:24:02 +0000 (UTC) (envelope-from weongyo@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 m9G8O2fK055580; Thu, 16 Oct 2008 08:24:02 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9G8O2Pq055578; Thu, 16 Oct 2008 08:24:02 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <200810160824.m9G8O2Pq055578@svn.freebsd.org> From: Weongyo Jeong Date: Thu, 16 Oct 2008 08:24:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183930 - in stable/7/sys: . dev/if_ndis dev/twa X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2008 08:24:03 -0000 Author: weongyo Date: Thu Oct 16 08:24:02 2008 New Revision: 183930 URL: http://svn.freebsd.org/changeset/base/183930 Log: MFC r183587: sc->ndis_txidx should be cycle between 0 and sc->ndis_maxpkts, not NDIS_TXPKTS and don't allocate unused extra spaces for sc->ndis_txarray and sc->ndis_txpool. PR: kern/127644 Submitted by: Antoine Pelisse Approved by: re (gnn) Modified: stable/7/sys/ (props changed) stable/7/sys/dev/if_ndis/if_ndis.c stable/7/sys/dev/if_ndis/if_ndisvar.h stable/7/sys/dev/twa/ (props changed) Modified: stable/7/sys/dev/if_ndis/if_ndis.c ============================================================================== --- stable/7/sys/dev/if_ndis/if_ndis.c Thu Oct 16 04:17:17 2008 (r183929) +++ stable/7/sys/dev/if_ndis/if_ndis.c Thu Oct 16 08:24:02 2008 (r183930) @@ -660,12 +660,12 @@ ndis_attach(dev) sc->ndis_maxpkts = 10; sc->ndis_txarray = malloc(sizeof(ndis_packet *) * - NDIS_TXPKTS, M_DEVBUF, M_NOWAIT|M_ZERO); + sc->ndis_maxpkts, M_DEVBUF, M_NOWAIT|M_ZERO); /* Allocate a pool of ndis_packets for TX encapsulation. */ NdisAllocatePacketPool(&i, &sc->ndis_txpool, - NDIS_TXPKTS, PROTOCOL_RESERVED_SIZE_IN_PACKET); + sc->ndis_maxpkts, PROTOCOL_RESERVED_SIZE_IN_PACKET); if (i != NDIS_STATUS_SUCCESS) { sc->ndis_txpool = NULL; Modified: stable/7/sys/dev/if_ndis/if_ndisvar.h ============================================================================== --- stable/7/sys/dev/if_ndis/if_ndisvar.h Thu Oct 16 04:17:17 2008 (r183929) +++ stable/7/sys/dev/if_ndis/if_ndisvar.h Thu Oct 16 08:24:02 2008 (r183930) @@ -87,7 +87,7 @@ TAILQ_HEAD(nch, ndis_cfglist); #define NDIS_TXPKTS 64 #define NDIS_INC(x) \ - (x)->ndis_txidx = ((x)->ndis_txidx + 1) % NDIS_TXPKTS + (x)->ndis_txidx = ((x)->ndis_txidx + 1) % (x)->ndis_maxpkts #if __FreeBSD_version < 600007 #define arpcom ic.ic_ac