These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / micrel / ksz884x.c

diff --git a/kernel/drivers/net/ethernet/micrel/ksz884x.c b/kernel/drivers/net/ethernet/micrel/ksz884x.c
index 6f332eb..75dc46c 100644 (file)
--- a/kernel/drivers/net/ethernet/micrel/ksz884x.c
+++ b/kernel/drivers/net/ethernet/micrel/ksz884x.c
@@ -6664,7 +6664,7 @@ static void mib_read_work(struct work_struct *work)
                                wake_up_interruptible(
                                        &hw_priv->counter[i].counter);
                        }
-               } else if (jiffies >= hw_priv->counter[i].time) {
+               } else if (time_after_eq(jiffies, hw_priv->counter[i].time)) {
                        /* Only read MIB counters when the port is connected. */
                        if (media_connected == mib->state)
                                hw_priv->counter[i].read = 1;
@@ -6689,7 +6689,7 @@ static void mib_monitor(unsigned long ptr)
 
        /* This is used to verify Wake-on-LAN is working. */
        if (hw_priv->pme_wait) {
-               if (hw_priv->pme_wait <= jiffies) {
+               if (time_is_before_eq_jiffies(hw_priv->pme_wait)) {
                        hw_clr_wol_pme_status(&hw_priv->hw);
                        hw_priv->pme_wait = 0;
                }