Message ID | 8578bb16-cd04-e8a5-c7f4-be061ede95b4@gmail.com |
---|---|
State | Not Applicable |
Headers | show |
On Tue, 26 Jul 2016, nick wrote: > diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c > index f42129d..e1830af 100644 > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c > @@ -3797,7 +3797,7 @@ static irqreturn_t e1000_intr(int irq, void *data) > hw->get_link_status = 1; > /* guard against interrupt when we're going down */ > if (!test_bit(__E1000_DOWN, &adapter->flags)) > - schedule_delayed_work(&adapter->watchdog_task, 1); > + mod_work(&adapter->watchdog_task, jiffies + 1); And that's not even funny anymore. Are you using a random generator to create these patches?
On Thu, 28 Jul 2016 09:45:12 +0200, Thomas Gleixner said: > On Tue, 26 Jul 2016, nick wrote: > > diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c > > index f42129d..e1830af 100644 > > --- a/drivers/net/ethernet/intel/e1000/e1000_main.c > > +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c > > @@ -3797,7 +3797,7 @@ static irqreturn_t e1000_intr(int irq, void *data) > > hw->get_link_status = 1; > > /* guard against interrupt when we're going down */ > > if (!test_bit(__E1000_DOWN, &adapter->flags)) > > - schedule_delayed_work(&adapter->watchdog_task, 1); > > + mod_work(&adapter->watchdog_task, jiffies + 1); > > And that's not even funny anymore. Are you using a random generator to create > these patches? At some point, we need to decide if the occasional accidentally-correct trivial patch from Nick is worth all the wasted maintainer time.
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index f42129d..e1830af 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -3797,7 +3797,7 @@ static irqreturn_t e1000_intr(int irq, void *data) hw->get_link_status = 1; /* guard against interrupt when we're going down */ if (!test_bit(__E1000_DOWN, &adapter->flags)) - schedule_delayed_work(&adapter->watchdog_task, 1); + mod_work(&adapter->watchdog_task, jiffies + 1); } /* disable interrupts, without the synchronize_irq bit */