Module Name: src
Committed By: pgoyette
Date: Sat Dec 11 14:19:29 UTC 2010
Modified Files:
src/sys/dev/pci: if_bnx.c
Log Message:
Fix a couple of name-space changes that fell through the cracks.
Hello, martin!
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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.37 src/sys/dev/pci/if_bnx.c:1.38
--- src/sys/dev/pci/if_bnx.c:1.37 Thu Dec 9 23:14:06 2010
+++ src/sys/dev/pci/if_bnx.c Sat Dec 11 14:19:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.37 2010/12/09 23:14:06 jym Exp $ */
+/* $NetBSD: if_bnx.c,v 1.38 2010/12/11 14:19:29 pgoyette 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.37 2010/12/09 23:14:06 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.38 2010/12/11 14:19:29 pgoyette Exp $");
/*
* The following controllers are supported by this driver:
@@ -3105,12 +3105,12 @@
vcid_addr = GET_CID_ADDR(96);
while (vcid_addr) {
- vcid_addr -= PHY_CTX_SIZE;
+ vcid_addr -= PHY_BNX_CTX_SIZE;
REG_WR(sc, BNX_CTX_VIRT_ADDR, 0);
REG_WR(sc, BNX_CTX_PAGE_TBL, vcid_addr);
- for(offset = 0; offset < PHY_CTX_SIZE; offset += 4) {
+ for(offset = 0; offset < PHY_BNX_CTX_SIZE; offset += 4) {
CTX_WR(sc, 0x00, offset, 0);
}
@@ -3411,7 +3411,7 @@
REG_WR(sc, BNX_MQ_CONFIG, val);
- val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_CTX_SIZE);
+ val = 0x10000 + (MAX_CID_CNT * MB_KERNEL_BNX_CTX_SIZE);
REG_WR(sc, BNX_MQ_KNL_BYP_WIND_START, val);
REG_WR(sc, BNX_MQ_KNL_WIND_END, val);
