From 4afa954a553f7f948bb903a83087522197f2a1bc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 7 Jan 2009 17:30:09 -0800 Subject: [PATCH] --- yaml --- r: 127795 b: refs/heads/master c: 1f5ec79b8ec357516fbe14904a47f619bb3b543d h: refs/heads/master i: 127793: 8ff67190cb2041260dfd3d3f6491e1f6296d5cc5 127791: 50ae3849d3e72f48b1c0c9e746d54311ccb53cf7 v: v3 --- [refs] | 2 +- trunk/drivers/net/enc28j60.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a07998baa307..b52f16117139 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bdd5553660bd07d7904af967893f8d487cc6c44 +refs/heads/master: 1f5ec79b8ec357516fbe14904a47f619bb3b543d diff --git a/trunk/drivers/net/enc28j60.c b/trunk/drivers/net/enc28j60.c index cefe1d98f93e..fc6cc038c7b8 100644 --- a/trunk/drivers/net/enc28j60.c +++ b/trunk/drivers/net/enc28j60.c @@ -1531,6 +1531,17 @@ static int enc28j60_chipset_init(struct net_device *dev) return enc28j60_hw_init(priv); } +static const struct net_device_ops enc28j60_netdev_ops = { + .ndo_open = enc28j60_net_open, + .ndo_stop = enc28j60_net_close, + .ndo_start_xmit = enc28j60_send_packet, + .ndo_set_multicast_list = enc28j60_set_multicast_list, + .ndo_set_mac_address = enc28j60_set_mac_address, + .ndo_tx_timeout = enc28j60_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, +}; + static int __devinit enc28j60_probe(struct spi_device *spi) { struct net_device *dev; @@ -1585,12 +1596,7 @@ static int __devinit enc28j60_probe(struct spi_device *spi) dev->if_port = IF_PORT_10BASET; dev->irq = spi->irq; - dev->open = enc28j60_net_open; - dev->stop = enc28j60_net_close; - dev->hard_start_xmit = enc28j60_send_packet; - dev->set_multicast_list = &enc28j60_set_multicast_list; - dev->set_mac_address = enc28j60_set_mac_address; - dev->tx_timeout = &enc28j60_tx_timeout; + dev->netdev_ops = &enc28j60_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; SET_ETHTOOL_OPS(dev, &enc28j60_ethtool_ops);