summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormsaitoh <msaitoh@NetBSD.org>2013-04-08 15:55:58 +0000
committermsaitoh <msaitoh@NetBSD.org>2013-04-08 15:55:58 +0000
commit15c95239daa26e9dd5ca01067a201318d79fcd97 (patch)
tree8120478d621ad8cff84f499a633a6534c598f3e9 /sys/dev
parentc209284faff5d265440669946c4d476c64aaaba7 (diff)
Fix the setting of Tx Random Backoff Register.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_bge.c10
-rw-r--r--sys/dev/pci/if_bgereg.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index 8de615dab1c..1d64d301e48 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -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 */
diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h
index a863ced3c31..837fa469c3b 100644
--- a/sys/dev/pci/if_bgereg.h
+++ b/sys/dev/pci/if_bgereg.h
@@ -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