Skip to content

Commit

Permalink
sc92031: convert to net_device_ops
Browse files Browse the repository at this point in the history
Convert this driver to net_device_ops. Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Nov 22, 2008
1 parent da1c14a commit 974acda
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions drivers/net/sc92031.c
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,7 @@ static void sc92031_ethtool_get_ethtool_stats(struct net_device *dev,
spin_unlock_bh(&priv->lock);
}

static struct ethtool_ops sc92031_ethtool_ops = {
static const struct ethtool_ops sc92031_ethtool_ops = {
.get_settings = sc92031_ethtool_get_settings,
.set_settings = sc92031_ethtool_set_settings,
.get_drvinfo = sc92031_ethtool_get_drvinfo,
Expand All @@ -1399,6 +1399,21 @@ static struct ethtool_ops sc92031_ethtool_ops = {
.get_ethtool_stats = sc92031_ethtool_get_ethtool_stats,
};


static const struct net_device_ops sc92031_netdev_ops = {
.ndo_get_stats = sc92031_get_stats,
.ndo_start_xmit = sc92031_start_xmit,
.ndo_open = sc92031_open,
.ndo_stop = sc92031_stop,
.ndo_set_multicast_list = sc92031_set_multicast_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
.ndo_tx_timeout = sc92031_tx_timeout,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = sc92031_poll_controller,
#endif
};

static int __devinit sc92031_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
Expand Down Expand Up @@ -1452,17 +1467,9 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
/* faked with skb_copy_and_csum_dev */
dev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA;

dev->get_stats = sc92031_get_stats;
dev->ethtool_ops = &sc92031_ethtool_ops;
dev->hard_start_xmit = sc92031_start_xmit;
dev->netdev_ops = &sc92031_netdev_ops;
dev->watchdog_timeo = TX_TIMEOUT;
dev->open = sc92031_open;
dev->stop = sc92031_stop;
dev->set_multicast_list = sc92031_set_multicast_list;
dev->tx_timeout = sc92031_tx_timeout;
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = sc92031_poll_controller;
#endif
dev->ethtool_ops = &sc92031_ethtool_ops;

priv = netdev_priv(dev);
spin_lock_init(&priv->lock);
Expand Down

0 comments on commit 974acda

Please sign in to comment.