projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'batadv-net-for-davem-20161026' of git://git.open-mesh.org/linux-merge
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2x
/
bnx2x_main.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index
20fe6a8
..
0cee4c0
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@
-15241,7
+15241,7
@@
static void bnx2x_init_cyclecounter(struct bnx2x *bp)
memset(&bp->cyclecounter, 0, sizeof(bp->cyclecounter));
bp->cyclecounter.read = bnx2x_cyclecounter_read;
bp->cyclecounter.mask = CYCLECOUNTER_MASK(64);
- bp->cyclecounter.shift =
1
;
+ bp->cyclecounter.shift =
0
;
bp->cyclecounter.mult = 1;
}