From patchwork Fri Feb 1 05:53:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ying Xue X-Patchwork-Id: 217350 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1D6292C0094 for ; Fri, 1 Feb 2013 16:50:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751913Ab3BAFuw (ORCPT ); Fri, 1 Feb 2013 00:50:52 -0500 Received: from mail.windriver.com ([147.11.1.11]:51315 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255Ab3BAFuu (ORCPT ); Fri, 1 Feb 2013 00:50:50 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r115olWw022963 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 31 Jan 2013 21:50:48 -0800 (PST) Received: from xueying-OptiPlex-755.corp.ad.wrs.com (128.224.163.179) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.318.4; Thu, 31 Jan 2013 21:50:47 -0800 From: Ying Xue To: CC: Subject: [PATCH] net: remove redundant checking for sock timer state Date: Fri, 1 Feb 2013 13:53:00 +0800 Message-ID: <1359697980-28613-1-git-send-email-ying.xue@windriver.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's unnecessary to check whether the sock timer to be stopped is pending or not in sk_stop_timer() as del_timer() will do the same thing later. Signed-off-by: Ying Xue --- net/core/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index bc131d4..33144bd 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2212,7 +2212,7 @@ EXPORT_SYMBOL(sk_reset_timer); void sk_stop_timer(struct sock *sk, struct timer_list* timer) { - if (timer_pending(timer) && del_timer(timer)) + if (del_timer(timer)) __sock_put(sk); } EXPORT_SYMBOL(sk_stop_timer);