Commit 5b131006 authored by David Gibson's avatar David Gibson Committed by Stephen Hemminger

[NET]: Fix initialization sequence in SunGEM driver.

parent aa1c61c1
...@@ -2731,6 +2731,19 @@ static int __devinit gem_init_one(struct pci_dev *pdev, ...@@ -2731,6 +2731,19 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
if (gem_get_device_address(gp)) if (gem_get_device_address(gp))
goto err_out_free_consistent; goto err_out_free_consistent;
dev->open = gem_open;
dev->stop = gem_close;
dev->hard_start_xmit = gem_start_xmit;
dev->get_stats = gem_get_stats;
dev->set_multicast_list = gem_set_multicast;
dev->do_ioctl = gem_ioctl;
dev->ethtool_ops = &gem_ethtool_ops;
dev->tx_timeout = gem_tx_timeout;
dev->watchdog_timeo = 5 * HZ;
dev->change_mtu = gem_change_mtu;
dev->irq = pdev->irq;
dev->dma = 0;
if (register_netdev(dev)) { if (register_netdev(dev)) {
printk(KERN_ERR PFX "Cannot register net device, " printk(KERN_ERR PFX "Cannot register net device, "
"aborting.\n"); "aborting.\n");
...@@ -2759,19 +2772,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev, ...@@ -2759,19 +2772,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
dev->open = gem_open;
dev->stop = gem_close;
dev->hard_start_xmit = gem_start_xmit;
dev->get_stats = gem_get_stats;
dev->set_multicast_list = gem_set_multicast;
dev->do_ioctl = gem_ioctl;
dev->ethtool_ops = &gem_ethtool_ops;
dev->tx_timeout = gem_tx_timeout;
dev->watchdog_timeo = 5 * HZ;
dev->change_mtu = gem_change_mtu;
dev->irq = pdev->irq;
dev->dma = 0;
/* GEM can do it all... */ /* GEM can do it all... */
dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM; dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;
if (pci_using_dac) if (pci_using_dac)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment