svn commit: r183930 - in stable/7/sys: . dev/if_ndis dev/twa

[Weongyo Jeong]

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 <apelisse_at_gmail.com>
  
  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