* [PATCH] marvell sky2 driver: fix irq number assignment bug
@ 2012-04-03 15:10 Chris Metcalf
2012-04-03 15:47 ` Ben Hutchings
0 siblings, 1 reply; 3+ messages in thread
From: Chris Metcalf @ 2012-04-03 15:10 UTC (permalink / raw)
To: Stephen Hemminger, netdev, linux-kernel
Fix a minor bug that will display wrong IRQ number in ifconfig output.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---
drivers/net/ethernet/marvell/sky2.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 423a1a2..879b0a4 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4978,6 +4978,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
goto err_out_free_netdev;
}
+ /*
+ * Need to set the IRQ # for the net_device here again after
+ * setting it in sky2_init_netdev() initially, because MSI
+ * will assign a new IRQ # to this PCI device.
+ */
+ dev->irq = hw->pdev->irq;
+
err = register_netdev(dev);
if (err) {
dev_err(&pdev->dev, "cannot register net device\n");
--
1.6.5.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] marvell sky2 driver: fix irq number assignment bug
2012-04-03 15:10 [PATCH] marvell sky2 driver: fix irq number assignment bug Chris Metcalf
@ 2012-04-03 15:47 ` Ben Hutchings
2012-04-03 21:41 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Ben Hutchings @ 2012-04-03 15:47 UTC (permalink / raw)
To: Chris Metcalf; +Cc: Stephen Hemminger, netdev, linux-kernel
On Tue, 2012-04-03 at 11:10 -0400, Chris Metcalf wrote:
> Fix a minor bug that will display wrong IRQ number in ifconfig output.
>
> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
> ---
> drivers/net/ethernet/marvell/sky2.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
> index 423a1a2..879b0a4 100644
> --- a/drivers/net/ethernet/marvell/sky2.c
> +++ b/drivers/net/ethernet/marvell/sky2.c
> @@ -4978,6 +4978,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
> goto err_out_free_netdev;
> }
>
> + /*
> + * Need to set the IRQ # for the net_device here again after
> + * setting it in sky2_init_netdev() initially, because MSI
> + * will assign a new IRQ # to this PCI device.
> + */
> + dev->irq = hw->pdev->irq;
> +
> err = register_netdev(dev);
> if (err) {
> dev_err(&pdev->dev, "cannot register net device\n");
I think the consensus now is that net_device::irq should be left at 0
for devices that don't support manual configuration (ISA and the like).
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] marvell sky2 driver: fix irq number assignment bug
2012-04-03 15:47 ` Ben Hutchings
@ 2012-04-03 21:41 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-04-03 21:41 UTC (permalink / raw)
To: bhutchings; +Cc: cmetcalf, shemminger, netdev, linux-kernel
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 3 Apr 2012 16:47:04 +0100
> On Tue, 2012-04-03 at 11:10 -0400, Chris Metcalf wrote:
>> Fix a minor bug that will display wrong IRQ number in ifconfig output.
>>
>> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
>> ---
>> drivers/net/ethernet/marvell/sky2.c | 7 +++++++
>> 1 files changed, 7 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
>> index 423a1a2..879b0a4 100644
>> --- a/drivers/net/ethernet/marvell/sky2.c
>> +++ b/drivers/net/ethernet/marvell/sky2.c
>> @@ -4978,6 +4978,13 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
>> goto err_out_free_netdev;
>> }
>>
>> + /*
>> + * Need to set the IRQ # for the net_device here again after
>> + * setting it in sky2_init_netdev() initially, because MSI
>> + * will assign a new IRQ # to this PCI device.
>> + */
>> + dev->irq = hw->pdev->irq;
>> +
>> err = register_netdev(dev);
>> if (err) {
>> dev_err(&pdev->dev, "cannot register net device\n");
>
> I think the consensus now is that net_device::irq should be left at 0
> for devices that don't support manual configuration (ISA and the like).
Agreed.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-03 21:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-03 15:10 [PATCH] marvell sky2 driver: fix irq number assignment bug Chris Metcalf
2012-04-03 15:47 ` Ben Hutchings
2012-04-03 21:41 ` David Miller
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).