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

Commit d9a811d5 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

sungem: update to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f89d12e

drivers/net/sungem.c

+14 −8
Original line number Original line Diff line number Diff line
@@ -2989,6 +2989,19 @@ static void gem_remove_one(struct pci_dev *pdev) 
	}

	}

}

}





static const struct net_device_ops gem_netdev_ops = {

	.ndo_open		= gem_open,

	.ndo_stop		= gem_close,

	.ndo_start_xmit		= gem_start_xmit,

	.ndo_get_stats		= gem_get_stats,

	.ndo_set_multicast_list = gem_set_multicast,

	.ndo_do_ioctl		= gem_ioctl,

	.ndo_tx_timeout		= gem_tx_timeout,

	.ndo_change_mtu		= gem_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



static int __devinit gem_init_one(struct pci_dev *pdev,

static int __devinit gem_init_one(struct pci_dev *pdev,

				  const struct pci_device_id *ent)

				  const struct pci_device_id *ent)

{

{
@@ -3142,17 +3155,10 @@ 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->netdev_ops = &gem_netdev_ops;

	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;

	netif_napi_add(dev, &gp->napi, gem_poll, 64);

	netif_napi_add(dev, &gp->napi, gem_poll, 64);

	dev->ethtool_ops = &gem_ethtool_ops;

	dev->ethtool_ops = &gem_ethtool_ops;

	dev->tx_timeout = gem_tx_timeout;

	dev->watchdog_timeo = 5 * HZ;

	dev->watchdog_timeo = 5 * HZ;

	dev->change_mtu = gem_change_mtu;

	dev->irq = pdev->irq;

	dev->irq = pdev->irq;

	dev->dma = 0;

	dev->dma = 0;

	dev->set_mac_address = gem_set_mac_address;

	dev->set_mac_address = gem_set_mac_address;