From patchwork Sat Feb 7 09:23:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 22494 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 28862DDDF0 for ; Sat, 7 Feb 2009 20:23:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752250AbZBGJXy (ORCPT ); Sat, 7 Feb 2009 04:23:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752103AbZBGJXx (ORCPT ); Sat, 7 Feb 2009 04:23:53 -0500 Received: from qmta01.emeryville.ca.mail.comcast.net ([76.96.30.16]:35215 "EHLO QMTA01.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751AbZBGJXw (ORCPT ); Sat, 7 Feb 2009 04:23:52 -0500 Received: from OMTA07.emeryville.ca.mail.comcast.net ([76.96.30.59]) by QMTA01.emeryville.ca.mail.comcast.net with comcast id CxNp1b00K1GXsucA1xPs5Q; Sat, 07 Feb 2009 09:23:52 +0000 Received: from lost.foo-projects.org ([63.64.152.142]) by OMTA07.emeryville.ca.mail.comcast.net with comcast id CxPZ1b00434bfcX8TxPbta; Sat, 07 Feb 2009 09:23:50 +0000 From: Jeff Kirsher Subject: [net-next PATCH 26/26] igb: remove dead code in transmit routine To: davem@davemloft.net Cc: netdev@vger.kernel.org, jeff@garzik.org, gospo@redhat.com, Jesse Brandeburg , Jeff Kirsher Date: Sat, 07 Feb 2009 01:23:32 -0800 Message-ID: <20090207092332.15697.16033.stgit@lost.foo-projects.org> In-Reply-To: <20090207091504.15697.26667.stgit@lost.foo-projects.org> References: <20090207091504.15697.26667.stgit@lost.foo-projects.org> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesse Brandeburg Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher --- drivers/net/igb/igb_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) -- 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/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 8bc1ffa..f8c2919 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -2951,12 +2951,9 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb, struct igb_adapter *adapter = netdev_priv(netdev); unsigned int first; unsigned int tx_flags = 0; - unsigned int len; u8 hdr_len = 0; int tso = 0; - len = skb_headlen(skb); - if (test_bit(__IGB_DOWN, &adapter->state)) { dev_kfree_skb_any(skb); return NETDEV_TX_OK;