diff options
| author | Denys Vlasenko | 2016-04-20 17:45:54 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2016-05-13 23:46:45 +0200 |
| commit | fb5277f2c2e4db4a29740ff071072a688892d2df (patch) | |
| tree | 778ebc482001afc2a817fe893bc25c2c4fbab8dc | |
| parent | igb: make igb_update_pf_vlvf static (diff) | |
| download | kernel-qcow2-linux-fb5277f2c2e4db4a29740ff071072a688892d2df.tar.gz kernel-qcow2-linux-fb5277f2c2e4db4a29740ff071072a688892d2df.tar.xz kernel-qcow2-linux-fb5277f2c2e4db4a29740ff071072a688892d2df.zip | |
e1000e: e1000e_cyclecounter_read(): incvalue is 32 bits, not 64
"incvalue" variable holds a result of "er32(TIMINCA) &
E1000_TIMINCA_INCVALUE_MASK" and used in "do_div(temp, incvalue)"
as a divisor.
Thus, "u64 incvalue" declaration is probably a mistake.
Even though it seems to be a harmless one, let's fix it.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 671256d32525..4969f647db88 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -4300,7 +4300,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc) } if ((hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82583)) { - u64 incvalue, time_delta, rem, temp; + u64 time_delta, rem, temp; + u32 incvalue; int i; /* errata for 82574/82583 possible bad bits read from SYSTIMH/L |