Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...

[cascardo/linux.git] / drivers / net / ethernet / intel / e1000e / netdev.c

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 73f7452..8294c9a 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4363,7 +4363,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
 
                        time_delta = systim_next - systim;
                        temp = time_delta;
-                       rem = do_div(temp, incvalue);
+                       /* VMWare users have seen incvalue of zero, don't div / 0 */
+                       rem = incvalue ? do_div(temp, incvalue) : (time_delta != 0);
 
                        systim = systim_next;