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 <[EMAIL PROTECTED]>
>
> --- 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
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
