CVS commit: src/sys/dev/pci

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Fri Nov 20 18:24:30 UTC 2009

Modified Files:
        src/sys/dev/pci: if_bnx.c

Log Message:
Remove duplicate PCI_PRODUCT_BROADCOM_BCM5709 entries.
BNX_MAX_MRU is now the 1500-bytes MTU; use BNX_MAX_JUMBO_MRU instead.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/if_bnx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.29 src/sys/dev/pci/if_bnx.c:1.30
--- src/sys/dev/pci/if_bnx.c:1.29	Wed Nov 18 23:11:16 2009
+++ src/sys/dev/pci/if_bnx.c	Fri Nov 20 18:24:29 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bnx.c,v 1.29 2009/11/18 23:11:16 bouyer Exp $	*/
+/*	$NetBSD: if_bnx.c,v 1.30 2009/11/20 18:24:29 bouyer Exp $	*/
 /*	$OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
 
 /*-
@@ -35,7 +35,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.29 2009/11/18 23:11:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.30 2009/11/20 18:24:29 bouyer Exp $");
 
 /*
  * The following controllers are supported by this driver:
@@ -155,11 +155,6 @@
 	{
 	  PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5709,
 	  0, 0,
-	  "Broadcom NetXtreme II BCM5709 1000Base-SX"
-	},
-	{
-	  PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5709,
-	  0, 0,
 	  "Broadcom NetXtreme II BCM5709 1000Base-T"
 	},
 	{
@@ -2393,8 +2388,8 @@
 	 * Create DMA maps for the Rx buffer mbufs.
 	 */
 	for (i = 0; i < TOTAL_RX_BD; i++) {
-		if (bus_dmamap_create(sc->bnx_dmatag, BNX_MAX_MRU,
-		    BNX_MAX_SEGMENTS, BNX_MAX_MRU, 0, BUS_DMA_NOWAIT,
+		if (bus_dmamap_create(sc->bnx_dmatag, BNX_MAX_JUMBO_MRU,
+		    BNX_MAX_SEGMENTS, BNX_MAX_JUMBO_MRU, 0, BUS_DMA_NOWAIT,
 		    &sc->rx_mbuf_map[i])) {
 			aprint_error_dev(sc->bnx_dev,
 			    "Could not create Rx mbuf %d DMA map!\n", i);
@@ -3697,7 +3692,7 @@
 	if (sc->mbuf_alloc_size == MCLBYTES)
 		min_free_bd = (MCLBYTES + PAGE_SIZE - 1) / PAGE_SIZE;
 	else
-		min_free_bd = (BNX_MAX_MRU + PAGE_SIZE - 1) / PAGE_SIZE;
+		min_free_bd = (BNX_MAX_JUMBO_MRU + PAGE_SIZE - 1) / PAGE_SIZE;
 	while (sc->free_rx_bd >= min_free_bd) {
 		/* Simulate an mbuf allocation failure. */
 		DBRUNIF(DB_RANDOMTRUE(bnx_debug_mbuf_allocation_failure),
@@ -4699,7 +4694,7 @@
 		sc->mbuf_alloc_size = MCLBYTES;
 	} else {
 		ether_mtu = BNX_MAX_JUMBO_ETHER_MTU_VLAN;
-		sc->mbuf_alloc_size = BNX_MAX_MRU;
+		sc->mbuf_alloc_size = BNX_MAX_JUMBO_MRU;
 	}