From patchwork Tue Apr 28 13:56:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 26564 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id F2208B6F44 for ; Tue, 28 Apr 2009 23:56:49 +1000 (EST) Received: by ozlabs.org (Postfix) id DF4B8DDF2E; Tue, 28 Apr 2009 23:56:49 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5198ADDF2A for ; Tue, 28 Apr 2009 23:56:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755317AbZD1N4m (ORCPT ); Tue, 28 Apr 2009 09:56:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753777AbZD1N4l (ORCPT ); Tue, 28 Apr 2009 09:56:41 -0400 Received: from mx2.redhat.com ([66.187.237.31]:46917 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751812AbZD1N4l (ORCPT ); Tue, 28 Apr 2009 09:56:41 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n3SDueDL003537; Tue, 28 Apr 2009 09:56:40 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n3SDueBw026511; Tue, 28 Apr 2009 09:56:40 -0400 Received: from doppio.ghostprotocols.net (vpn-10-102.bos.redhat.com [10.16.10.102]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n3SDub5H008757; Tue, 28 Apr 2009 09:56:39 -0400 Received: by doppio.ghostprotocols.net (Postfix, from userid 500) id C16AE261B9; Tue, 28 Apr 2009 10:56:36 -0300 (BRT) Date: Tue, 28 Apr 2009 10:56:36 -0300 From: Arnaldo Carvalho de Melo To: David Miller Cc: Linux Networking Development Mailing List Subject: inet_diag: Remove dup assignments Message-ID: <20090428135636.GF19908@ghostprotocols.net> MIME-Version: 1.0 Content-Disposition: inline X-Url: http://oops.ghostprotocols.net:81/blog User-Agent: Mutt/1.5.18 (2008-05-17) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These are later assigned to other values without being used meanwhile. Signed-off-by: Arnaldo Carvalho de Melo --- 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/inet_diag.c b/net/ipv4/inet_diag.c index 588a779..b0b2735 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -198,8 +198,6 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, tmo = 0; r->idiag_family = tw->tw_family; - r->idiag_state = tw->tw_state; - r->idiag_timer = 0; r->idiag_retrans = 0; r->id.idiag_if = tw->tw_bound_dev_if; r->id.idiag_cookie[0] = (u32)(unsigned long)tw;