From c0edbb09c5befd2442acb6f266ef7d1fec5eb6c6 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 21 Nov 2008 17:35:16 -0800 Subject: [PATCH] --- yaml --- r: 122067 b: refs/heads/master c: bfd82c35824016920c629ea55963dc6db6f9effe h: refs/heads/master i: 122065: 9681f2e82abceab932c148b39221bf7fcf309132 122063: 40779b55228b4be807704e0fa687314244f34628 v: v3 --- [refs] | 2 +- trunk/drivers/net/yellowfin.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e8ac8048b4a8..92c50e557dcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7bd89cbb1aa8342617c2f8a6dc0595e5f553115 +refs/heads/master: bfd82c35824016920c629ea55963dc6db6f9effe diff --git a/trunk/drivers/net/yellowfin.c b/trunk/drivers/net/yellowfin.c index d8dbc57f3e56..f806e6361a3c 100644 --- a/trunk/drivers/net/yellowfin.c +++ b/trunk/drivers/net/yellowfin.c @@ -355,6 +355,16 @@ static int yellowfin_close(struct net_device *dev); static void set_rx_mode(struct net_device *dev); static const struct ethtool_ops ethtool_ops; +static const struct net_device_ops netdev_ops = { + .ndo_open = yellowfin_open, + .ndo_stop = yellowfin_close, + .ndo_start_xmit = yellowfin_start_xmit, + .ndo_set_multicast_list = set_rx_mode, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_do_ioctl = netdev_ioctl, + .ndo_tx_timeout = yellowfin_tx_timeout, +}; static int __devinit yellowfin_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -464,13 +474,8 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, np->duplex_lock = 1; /* The Yellowfin-specific entries in the device structure. */ - dev->open = &yellowfin_open; - dev->hard_start_xmit = &yellowfin_start_xmit; - dev->stop = &yellowfin_close; - dev->set_multicast_list = &set_rx_mode; - dev->do_ioctl = &netdev_ioctl; + dev->netdev_ops = &netdev_ops; SET_ETHTOOL_OPS(dev, ðtool_ops); - dev->tx_timeout = yellowfin_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; if (mtu)