| Message ID | 1400781165-26498-1-git-send-email-manuel.schoelling@gmx.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Manuel Schölling <manuel.schoelling@gmx.de> Date: Thu, 22 May 2014 19:52:45 +0200 > To be future-proof and for better readability the time comparisons are modified > to use time_before_eq() instead of plain, error-prone math. > > Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 22 May 2014, Manuel Schölling wrote: > To be future-proof and for better readability the time comparisons are modified > to use time_before_eq() instead of plain, error-prone math. I had the impression that the real reason for these functions was that they were somehow sensitive to the possibility of overflow of jiffies? julia > Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> > --- > drivers/net/ethernet/micrel/ksz884x.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c > index 14ac0e2..90fa5f3 100644 > --- a/drivers/net/ethernet/micrel/ksz884x.c > +++ b/drivers/net/ethernet/micrel/ksz884x.c > @@ -4930,7 +4930,7 @@ static void netdev_tx_timeout(struct net_device *dev) > * Only reset the hardware if time between calls is long > * enough. > */ > - if (jiffies - last_reset <= dev->watchdog_timeo) > + if (time_before_eq(jiffies, last_reset + dev->watchdog_timeo)) > hw_priv = NULL; > } > > -- > 1.7.10.4 > >
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 14ac0e2..90fa5f3 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -4930,7 +4930,7 @@ static void netdev_tx_timeout(struct net_device *dev) * Only reset the hardware if time between calls is long * enough. */ - if (jiffies - last_reset <= dev->watchdog_timeo) + if (time_before_eq(jiffies, last_reset + dev->watchdog_timeo)) hw_priv = NULL; }
To be future-proof and for better readability the time comparisons are modified to use time_before_eq() instead of plain, error-prone math. Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de> --- drivers/net/ethernet/micrel/ksz884x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)