From patchwork Tue Oct 21 02:11:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 5176 X-Patchwork-Delegate: jgarzik@pobox.com 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 40297DDDE7 for ; Tue, 21 Oct 2008 13:11:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752197AbYJUCLx (ORCPT ); Mon, 20 Oct 2008 22:11:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752119AbYJUCLw (ORCPT ); Mon, 20 Oct 2008 22:11:52 -0400 Received: from mail.vyatta.com ([76.74.103.46]:56787 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbYJUCLw (ORCPT ); Mon, 20 Oct 2008 22:11:52 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id BBF014F42AB; Mon, 20 Oct 2008 19:11:52 -0700 (PDT) X-Virus-Scanned: amavisd-new at Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L9bK6Ou6IaVe; Mon, 20 Oct 2008 19:11:52 -0700 (PDT) Received: from extreme (unknown [96.225.231.79]) by mail.vyatta.com (Postfix) with ESMTP id 1514F4F429F; Mon, 20 Oct 2008 19:11:51 -0700 (PDT) Date: Mon, 20 Oct 2008 19:11:49 -0700 From: Stephen Hemminger To: Jesse Brandeburg , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org Subject: [PATCH] e1000e: get rid of wasted space Message-ID: <20081020191149.1dbf8e3b@extreme> Organization: Vyatta X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The name in the ring is only used once during setup so it shouldn't be in the data structure. Signed-off-by: Stephen Hemminger --- 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 --- a/drivers/net/e1000e/e1000.h 2008-10-20 18:13:53.000000000 -0700 +++ b/drivers/net/e1000e/e1000.h 2008-10-20 18:18:30.000000000 -0700 @@ -153,7 +153,6 @@ struct e1000_ring { /* array of buffer information structs */ struct e1000_buffer *buffer_info; - char name[IFNAMSIZ + 5]; u32 ims_val; u32 itr_val; u16 itr_register; --- a/drivers/net/e1000e/netdev.c 2008-10-20 18:19:22.000000000 -0700 +++ b/drivers/net/e1000e/netdev.c 2008-10-20 18:21:00.000000000 -0700 @@ -1473,27 +1473,20 @@ static int e1000_request_msix(struct e10 { struct net_device *netdev = adapter->netdev; int err = 0, vector = 0; + char irqname[IFNAMSIZ+5]; - if (strlen(netdev->name) < (IFNAMSIZ - 5)) - sprintf(adapter->rx_ring->name, "%s-rx0", netdev->name); - else - memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); + snprintf(irqname, sizeof(irqname), "%s-rx0", netdev->name); err = request_irq(adapter->msix_entries[vector].vector, - &e1000_intr_msix_rx, 0, adapter->rx_ring->name, - netdev); + &e1000_intr_msix_rx, 0, irqname, netdev); if (err) goto out; adapter->rx_ring->itr_register = E1000_EITR_82574(vector); adapter->rx_ring->itr_val = adapter->itr; vector++; - if (strlen(netdev->name) < (IFNAMSIZ - 5)) - sprintf(adapter->tx_ring->name, "%s-tx0", netdev->name); - else - memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); + snprintf(irqname, sizeof(irqname), "%s-tx0", netdev->name); err = request_irq(adapter->msix_entries[vector].vector, - &e1000_intr_msix_tx, 0, adapter->tx_ring->name, - netdev); + &e1000_intr_msix_tx, 0, irqname, netdev); if (err) goto out; adapter->tx_ring->itr_register = E1000_EITR_82574(vector);