From patchwork Mon Aug 22 10:03:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Yu X-Patchwork-Id: 110887 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 9603CB6F57 for ; Mon, 22 Aug 2011 20:03:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756596Ab1HVKDZ (ORCPT ); Mon, 22 Aug 2011 06:03:25 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:38789 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084Ab1HVKDX (ORCPT ); Mon, 22 Aug 2011 06:03:23 -0400 Received: by pzk37 with SMTP id 37so8412522pzk.1 for ; Mon, 22 Aug 2011 03:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=dCzacWkxOvFKL6pEgf63oSES5TxrtyB8ee7/a9tu/o4=; b=Z/n4dCiXKuv74PqbBexyZt0tTLColAPXjygphcY5cbqeZqwg650bE5Nlu1vL5A9Zqf LsQv7YPJsqEp8+hspWagzJH9Fi0bRWbxBS8Y/kiwNs6L7ehdVWpz8WeiQQfpGbQxITUI 7i+qe9oVLbl2+eBlDyNP/QsOL8ai2RrhV+FGg= Received: by 10.143.97.15 with SMTP id z15mr1563163wfl.405.1314007402968; Mon, 22 Aug 2011 03:03:22 -0700 (PDT) Received: from [10.32.160.31] ([182.92.247.1]) by mx.google.com with ESMTPS id g4sm4144859pbj.57.2011.08.22.03.03.20 (version=SSLv3 cipher=OTHER); Mon, 22 Aug 2011 03:03:22 -0700 (PDT) Message-ID: <4E52295D.8040901@gmail.com> Date: Mon, 22 Aug 2011 18:03:09 +0800 From: Li Yu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110617 Lightning/1.0b2 Thunderbird/3.1.11 MIME-Version: 1.0 To: "netdev@vger.kernel.org" Subject: [net-next PATCH] tcp: remove useless assignment statement in tcp_keepalive_timer Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove useless assignment statement, it may be trash after refactoring? Signed-off-by: Li Yu --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index ecd44b0..321ff2f 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -552,8 +552,6 @@ static void tcp_keepalive_timer (unsigned long data) if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE) goto out; - elapsed = keepalive_time_when(tp); - /* It is alive without keepalive 8) */ if (tp->packets_out || tcp_send_head(sk)) goto resched;