diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-04-14 21:09:16 +0000 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-04-22 17:06:52 +0200 |
commit | 46ac2f53dfe93a25b251696b946af7b673978ccb (patch) | |
tree | 50626b7fdbcffd4b337691a0c1fedc4bcb8caf6b /net | |
parent | ccdd92c17e144c8494f4c94ab85b48d297545cec (diff) | |
download | linux-stable-46ac2f53dfe93a25b251696b946af7b673978ccb.tar.gz linux-stable-46ac2f53dfe93a25b251696b946af7b673978ccb.tar.bz2 linux-stable-46ac2f53dfe93a25b251696b946af7b673978ccb.zip |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/pktgen.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 508155b283dd..54817d365366 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(); |