Module Name: src
Committed By: msaitoh
Date: Mon Apr 8 15:55:58 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c if_bgereg.h
Log Message:
Fix the setting of Tx Random Backoff Register.
To generate a diff of this commit:
cvs rdiff -u -r1.234 -r1.235 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/if_bgereg.h
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_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.234 src/sys/dev/pci/if_bge.c:1.235
--- src/sys/dev/pci/if_bge.c:1.234 Mon Apr 8 03:35:11 2013
+++ src/sys/dev/pci/if_bge.c Mon Apr 8 15:55:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.234 2013/04/08 03:35:11 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.235 2013/04/08 15:55:58 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.234 2013/04/08 03:35:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.235 2013/04/08 15:55:58 msaitoh Exp $");
#include "vlan.h"
@@ -2813,9 +2813,9 @@ bge_blockinit(struct bge_softc *sc)
/* Set random backoff seed for TX */
CSR_WRITE_4(sc, BGE_TX_RANDOM_BACKOFF,
- CLLADDR(ifp->if_sadl)[0] + CLLADDR(ifp->if_sadl)[1] +
- CLLADDR(ifp->if_sadl)[2] + CLLADDR(ifp->if_sadl)[3] +
- CLLADDR(ifp->if_sadl)[4] + CLLADDR(ifp->if_sadl)[5] +
+ (CLLADDR(ifp->if_sadl)[0] + CLLADDR(ifp->if_sadl)[1] +
+ CLLADDR(ifp->if_sadl)[2] + CLLADDR(ifp->if_sadl)[3] +
+ CLLADDR(ifp->if_sadl)[4] + CLLADDR(ifp->if_sadl)[5]) &
BGE_TX_BACKOFF_SEED_MASK);
/* Set inter-packet gap */
Index: src/sys/dev/pci/if_bgereg.h
diff -u src/sys/dev/pci/if_bgereg.h:1.71 src/sys/dev/pci/if_bgereg.h:1.72
--- src/sys/dev/pci/if_bgereg.h:1.71 Wed Mar 27 12:11:57 2013
+++ src/sys/dev/pci/if_bgereg.h Mon Apr 8 15:55:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.71 2013/03/27 12:11:57 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.72 2013/04/08 15:55:58 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -754,7 +754,7 @@
#define BGE_LEDCTL_BLINKPERIOD_OVERRIDE 0x80000000
/* TX backoff seed register */
-#define BGE_TX_BACKOFF_SEED_MASK 0x3F
+#define BGE_TX_BACKOFF_SEED_MASK 0x3FF
/* Autopoll status register */
#define BGE_AUTOPOLLSTS_ERROR 0x00000001
