From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964783AbbDNVMo (ORCPT ); Tue, 14 Apr 2015 17:12:44 -0400 Received: from www.linutronix.de ([62.245.132.108]:38192 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932246AbbDNVJE (ORCPT ); Tue, 14 Apr 2015 17:09:04 -0400 Message-Id: <20150414203503.165258315@linutronix.de> User-Agent: quilt/0.63-1 Date: Tue, 14 Apr 2015 21:09:16 -0000 From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Ingo Molnar , Preeti U Murthy , Viresh Kumar , Marcelo Tosatti , Frederic Weisbecker , "David S. Miller" , netdev@vger.kernel.org Subject: [patch 31/39] net: core: pktgen: Remove bogus hrtimer_active() check References: <20150414203303.702062272@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=net-core-pktgen-remove-bogus-hrtimer-is-active-check.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: "David S. Miller" Cc: netdev@vger.kernel.org --- net/core/pktgen.c | 2 -- 1 file changed, 2 deletions(-) Index: tip/net/core/pktgen.c =================================================================== --- tip.orig/net/core/pktgen.c +++ tip/net/core/pktgen.c @@ -2212,8 +2212,6 @@ static void spin(struct pktgen_dev *pkt_ 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();