GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 18:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

myri10ge: stop using net_device.{base_addr, irq}.

Browse source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jon Mason <mason@myri.com>
Acked-by: Andrew Gallatin <gallatin@myri.com>
This commit is contained in:
Francois Romieu 2012-03-23 18:51:20 +01:00
parent 57d6d456cf
commit a742545887
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
View file

@ -4033,7 +4033,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev->netdev_ops = &myri10ge_netdev_ops; netdev->netdev_ops = &myri10ge_netdev_ops;
netdev->mtu = myri10ge_initial_mtu; netdev->mtu = myri10ge_initial_mtu;
netdev->base_addr = mgp->iomem_base;
netdev->hw_features = mgp->features | NETIF_F_LRO | NETIF_F_RXCSUM; netdev->hw_features = mgp->features | NETIF_F_LRO | NETIF_F_RXCSUM;
netdev->features = netdev->hw_features; netdev->features = netdev->hw_features;
@ -4047,12 +4046,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netdev->vlan_features &= ~NETIF_F_TSO; netdev->vlan_features &= ~NETIF_F_TSO;
/* make sure we can get an irq, and that MSI can be /* make sure we can get an irq, and that MSI can be
* setup (if available). Also ensure netdev->irq * setup (if available). */
* is set to correct value if MSI is enabled */
status = myri10ge_request_irq(mgp); status = myri10ge_request_irq(mgp);
if (status != 0) if (status != 0)
goto abort_with_firmware; goto abort_with_firmware;
netdev->irq = pdev->irq;
myri10ge_free_irq(mgp); myri10ge_free_irq(mgp);
/* Save configuration space to be restored if the /* Save configuration space to be restored if the
@ -4077,7 +4074,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
else else
dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n", dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
mgp->msi_enabled ? "MSI" : "xPIC", mgp->msi_enabled ? "MSI" : "xPIC",
netdev->irq, mgp->tx_boundary, mgp->fw_name, pdev->irq, mgp->tx_boundary, mgp->fw_name,
(mgp->wc_enabled ? "Enabled" : "Disabled")); (mgp->wc_enabled ? "Enabled" : "Disabled"));
board_number++; board_number++;