|
@@ -2307,8 +2307,7 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)
|
|
|
"Unable to allocate MSI interrupt Error: %d\n",
|
|
|
err);
|
|
|
adapter->have_msi = false;
|
|
|
- } else
|
|
|
- netdev->irq = pdev->irq;
|
|
|
+ }
|
|
|
|
|
|
if (!adapter->have_msi)
|
|
|
flags |= IRQF_SHARED;
|
|
@@ -2616,7 +2615,6 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
|
|
|
SET_NETDEV_DEV(netdev, &pdev->dev);
|
|
|
pci_set_drvdata(pdev, netdev);
|
|
|
|
|
|
- netdev->irq = pdev->irq;
|
|
|
netdev->netdev_ops = &atl1c_netdev_ops;
|
|
|
netdev->watchdog_timeo = AT_TX_WATCHDOG;
|
|
|
atl1c_set_ethtool_ops(netdev);
|
|
@@ -2706,7 +2704,6 @@ static int __devinit atl1c_probe(struct pci_dev *pdev,
|
|
|
dev_err(&pdev->dev, "cannot map device registers\n");
|
|
|
goto err_ioremap;
|
|
|
}
|
|
|
- netdev->base_addr = (unsigned long)adapter->hw.hw_addr;
|
|
|
|
|
|
/* init mii data */
|
|
|
adapter->mii.dev = netdev;
|