From patchwork Tue Aug 25 14:43:17 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: 32041 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 2E3FCB7B64 for ; Wed, 26 Aug 2009 00:43:53 +1000 (EST) Received: by ozlabs.org (Postfix) id 1F4C3DDDA2; Wed, 26 Aug 2009 00:43:53 +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 A38BDDDD0C for ; Wed, 26 Aug 2009 00:43:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755230AbZHYOnd (ORCPT ); Tue, 25 Aug 2009 10:43:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755214AbZHYOnc (ORCPT ); Tue, 25 Aug 2009 10:43:32 -0400 Received: from qmta08.emeryville.ca.mail.comcast.net ([76.96.30.80]:42020 "EHLO QMTA08.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755215AbZHYOnc (ORCPT ); Tue, 25 Aug 2009 10:43:32 -0400 Received: from OMTA19.emeryville.ca.mail.comcast.net ([76.96.30.76]) by QMTA08.emeryville.ca.mail.comcast.net with comcast id Yd0E1c0031eYJf8A8ejbJF; Tue, 25 Aug 2009 14:43:35 +0000 Received: from localhost.localdomain ([63.64.152.142]) by OMTA19.emeryville.ca.mail.comcast.net with comcast id YejJ1c00934bfcX01ejLKr; Tue, 25 Aug 2009 14:43:32 +0000 From: Jeff Kirsher Subject: [net-next PATCH] e1000: Remove unused function e1000_mta_set. To: davem@davemloft.net Cc: netdev@vger.kernel.org, gospo@redhat.com, Dave Graham , Jeff Kirsher Date: Tue, 25 Aug 2009 07:43:17 -0700 Message-ID: <20090825144250.15297.79619.stgit@localhost.localdomain> 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: Graham, David Remove function e1000_mta_set, as it is no longer called Signed-off-by: Dave Graham Signed-off-by: Jeff Kirsher --- drivers/net/e1000/e1000_hw.c | 46 ------------------------------------------ 1 files changed, 0 insertions(+), 46 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/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 1e5ae11..cda6b39 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -5759,52 +5759,6 @@ u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr) } /****************************************************************************** - * Sets the bit in the multicast table corresponding to the hash value. - * - * hw - Struct containing variables accessed by shared code - * hash_value - Multicast address hash value - *****************************************************************************/ -void e1000_mta_set(struct e1000_hw *hw, u32 hash_value) -{ - u32 hash_bit, hash_reg; - u32 mta; - u32 temp; - - /* The MTA is a register array of 128 32-bit registers. - * It is treated like an array of 4096 bits. We want to set - * bit BitArray[hash_value]. So we figure out what register - * the bit is in, read it, OR in the new bit, then write - * back the new value. The register is determined by the - * upper 7 bits of the hash value and the bit within that - * register are determined by the lower 5 bits of the value. - */ - hash_reg = (hash_value >> 5) & 0x7F; - if (hw->mac_type == e1000_ich8lan) - hash_reg &= 0x1F; - - hash_bit = hash_value & 0x1F; - - mta = E1000_READ_REG_ARRAY(hw, MTA, hash_reg); - - mta |= (1 << hash_bit); - - /* If we are on an 82544 and we are trying to write an odd offset - * in the MTA, save off the previous entry before writing and - * restore the old value after writing. - */ - if ((hw->mac_type == e1000_82544) && ((hash_reg & 0x1) == 1)) { - temp = E1000_READ_REG_ARRAY(hw, MTA, (hash_reg - 1)); - E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta); - E1000_WRITE_FLUSH(); - E1000_WRITE_REG_ARRAY(hw, MTA, (hash_reg - 1), temp); - E1000_WRITE_FLUSH(); - } else { - E1000_WRITE_REG_ARRAY(hw, MTA, hash_reg, mta); - E1000_WRITE_FLUSH(); - } -} - -/****************************************************************************** * Puts an ethernet address into a receive address register. * * hw - Struct containing variables accessed by shared code