From: Jeff Garzik <jeff@garzik.org>
To: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org
Subject: Re: [PATCH] e1000e: get rid of wasted space
Date: Wed, 22 Oct 2008 07:03:30 -0400 [thread overview]
Message-ID: <48FF0882.9050007@garzik.org> (raw)
In-Reply-To: <20081020191149.1dbf8e3b@extreme>
Stephen Hemminger wrote:
> 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 <shemminger@vyatta.com>
>
> --- 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);
ACK
for what it's worth... I am following DaveM's lead, and waiting until
net-next opens to start taking patches for 2.6.29. He wants us to focus
on bug fixing for now.
So, please resend once the merge window opens... thanks.
Jeff
next prev parent reply other threads:[~2008-10-22 11:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-21 2:11 [PATCH] e1000e: get rid of wasted space Stephen Hemminger
2008-10-21 10:23 ` Ben Hutchings
2008-10-22 11:03 ` Jeff Garzik [this message]
2008-10-22 18:01 ` Williams, Mitch A
2008-10-22 18:07 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48FF0882.9050007@garzik.org \
--to=jeff@garzik.org \
--cc=e1000-devel@lists.sourceforge.net \
--cc=jesse.brandeburg@intel.com \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).