Messages in this thread Patch in this message | | | Date | Wed, 22 Apr 2015 12:13:16 -0700 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:timers/core] net: core: pktgen: Remove bogus hrtimer_active( ) check |
| |
Commit-ID: 46ac2f53dfe93a25b251696b946af7b673978ccb Gitweb: http://git.kernel.org/tip/46ac2f53dfe93a25b251696b946af7b673978ccb Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Tue, 14 Apr 2015 21:09:16 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Wed, 22 Apr 2015 17:06:52 +0200
net: core: pktgen: Remove bogus hrtimer_active() check
The check for hrtimer_active() after starting the timer is pointless. If the timer is inactive it has expired already and therefor the task pointer is already NULL.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <peterz@infradead.org> Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Link: http://lkml.kernel.org/r/20150414203503.165258315@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- net/core/pktgen.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 508155b..54817d3 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2212,8 +2212,6 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); - if (!hrtimer_active(&t.timer)) - t.task = NULL; if (likely(t.task)) schedule();
| |