aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-01-07 20:25:41 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-07 20:25:41 -0500
commit83d6f0352cc47b41d42cc1d6fb31bc8d9753b772 (patch)
tree582f1b8f964501a895c4e2deb81ad976424d18da
parentab638e69ff7d4882ac152ada17eab340c93df080 (diff)
cassini: update to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/cassini.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 321f43d9f0e2..840b3d1a22f5 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4977,6 +4977,22 @@ static void __devinit cas_program_bridge(struct pci_dev *cas_pdev)
4977 pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xff); 4977 pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0xff);
4978} 4978}
4979 4979
4980static const struct net_device_ops cas_netdev_ops = {
4981 .ndo_open = cas_open,
4982 .ndo_stop = cas_close,
4983 .ndo_start_xmit = cas_start_xmit,
4984 .ndo_get_stats = cas_get_stats,
4985 .ndo_set_multicast_list = cas_set_multicast,
4986 .ndo_do_ioctl = cas_ioctl,
4987 .ndo_tx_timeout = cas_tx_timeout,
4988 .ndo_change_mtu = cas_change_mtu,
4989 .ndo_set_mac_address = eth_mac_addr,
4990 .ndo_validate_addr = eth_validate_addr,
4991#ifdef CONFIG_NET_POLL_CONTROLLER
4992 .ndo_poll_controller = cas_netpoll,
4993#endif
4994};
4995
4980static int __devinit cas_init_one(struct pci_dev *pdev, 4996static int __devinit cas_init_one(struct pci_dev *pdev,
4981 const struct pci_device_id *ent) 4997 const struct pci_device_id *ent)
4982{ 4998{
@@ -5166,22 +5182,13 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
5166 for (i = 0; i < N_RX_FLOWS; i++) 5182 for (i = 0; i < N_RX_FLOWS; i++)
5167 skb_queue_head_init(&cp->rx_flows[i]); 5183 skb_queue_head_init(&cp->rx_flows[i]);
5168 5184
5169 dev->open = cas_open; 5185 dev->netdev_ops = &cas_netdev_ops;
5170 dev->stop = cas_close;
5171 dev->hard_start_xmit = cas_start_xmit;
5172 dev->get_stats = cas_get_stats;
5173 dev->set_multicast_list = cas_set_multicast;
5174 dev->do_ioctl = cas_ioctl;
5175 dev->ethtool_ops = &cas_ethtool_ops; 5186 dev->ethtool_ops = &cas_ethtool_ops;
5176 dev->tx_timeout = cas_tx_timeout;
5177 dev->watchdog_timeo = CAS_TX_TIMEOUT; 5187 dev->watchdog_timeo = CAS_TX_TIMEOUT;
5178 dev->change_mtu = cas_change_mtu; 5188
5179#ifdef USE_NAPI 5189#ifdef USE_NAPI
5180 netif_napi_add(dev, &cp->napi, cas_poll, 64); 5190 netif_napi_add(dev, &cp->napi, cas_poll, 64);
5181#endif 5191#endif
5182#ifdef CONFIG_NET_POLL_CONTROLLER
5183 dev->poll_controller = cas_netpoll;
5184#endif
5185 dev->irq = pdev->irq; 5192 dev->irq = pdev->irq;
5186 dev->dma = 0; 5193 dev->dma = 0;
5187 5194