Attachment 293662 Details for Bug 431004 – e1000e-irq-minimize.patch

[patch] e1000e-irq-minimize.patch

e1000e-irq-minimize.patch (text/plain), 1.04 KB, created by Andy Gospodarek on 2008-01-31 23:08:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2008-01-31 23:08:09 UTC

Size: 1.04 KB

patch

obsolete

>diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
>index 0a2cb79..0c8cd1c 100644
>--- a/drivers/net/e1000e/netdev.c
>+++ b/drivers/net/e1000e/netdev.c
>@@ -945,11 +945,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
> 	int irq_flags = IRQF_SHARED;
> 	int err;
> 
>-	err = pci_enable_msi(adapter->pdev);
>-	if (err) {
>-		ndev_warn(netdev,
>-		 "Unable to allocate MSI interrupt Error: %d\n", err);
>-	} else {
>+	if (!pci_enable_msi(adapter->pdev)) {
> 		adapter->flags |= FLAG_MSI_ENABLED;
> 		handler = e1000_intr_msi;
> 		irq_flags = 0;
>@@ -958,10 +954,12 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
> 	err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
> 			  netdev);
> 	if (err) {
>+		ndev_err(netdev,
>+		       "Unable to allocate %s interrupt (return: %d)\n",
>+			adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx"
>+			err);
> 		if (adapter->flags & FLAG_MSI_ENABLED)
> 			pci_disable_msi(adapter->pdev);
>-		ndev_err(netdev,
>-		       "Unable to allocate interrupt Error: %d\n", err);
> 	}
> 
> 	return err;

Actions: View | Diff

Attachments on bug 431004: 293662 | 293663