Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7425458 authored by Francois Romieu's avatar Francois Romieu
Browse files

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



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Jon Mason <mason@myri.com>
Acked-by: default avatarAndrew Gallatin <gallatin@myri.com>
parent 57d6d456

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

+2 −5
Original line number Diff line number Diff line
@@ -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->mtu = myri10ge_initial_mtu;

	netdev->base_addr = mgp->iomem_base;

	netdev->hw_features = mgp->features | NETIF_F_LRO | NETIF_F_RXCSUM;

	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;



	/* make sure we can get an irq, and that MSI can be

	 * setup (if available).  Also ensure netdev->irq

	 * is set to correct value if MSI is enabled */

	 * setup (if available). */

	status = myri10ge_request_irq(mgp);

	if (status != 0)

		goto abort_with_firmware;

	netdev->irq = pdev->irq;

	myri10ge_free_irq(mgp);



	/* 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

		dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",

			 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"));



	board_number++;