diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-21 22:55:36 -0400 |
commit | fb72e2ff356e55b6a60c5883d4506175652c3e9d (patch) | |
tree | d7fd4323f82ced410f013701a05407aba0b60e69 /drivers/net/pcmcia | |
parent | 97161d4b2a28857f217b2035b2141cbb36f22f8b (diff) |
pcmcia: convert 3c574 to net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/pcmcia')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 2404a838b1fe..8f3872b8985d 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -257,6 +257,18 @@ static void tc574_detach(struct pcmcia_device *p_dev); | |||
257 | local data structures for one device. The device is registered | 257 | local data structures for one device. The device is registered |
258 | with Card Services. | 258 | with Card Services. |
259 | */ | 259 | */ |
260 | static const struct net_device_ops el3_netdev_ops = { | ||
261 | .ndo_open = el3_open, | ||
262 | .ndo_stop = el3_close, | ||
263 | .ndo_start_xmit = el3_start_xmit, | ||
264 | .ndo_tx_timeout = el3_tx_timeout, | ||
265 | .ndo_get_stats = el3_get_stats, | ||
266 | .ndo_do_ioctl = el3_ioctl, | ||
267 | .ndo_set_multicast_list = set_rx_mode, | ||
268 | .ndo_change_mtu = eth_change_mtu, | ||
269 | .ndo_set_mac_address = eth_mac_addr, | ||
270 | .ndo_validate_addr = eth_validate_addr, | ||
271 | }; | ||
260 | 272 | ||
261 | static int tc574_probe(struct pcmcia_device *link) | 273 | static int tc574_probe(struct pcmcia_device *link) |
262 | { | 274 | { |
@@ -284,18 +296,9 @@ static int tc574_probe(struct pcmcia_device *link) | |||
284 | link->conf.IntType = INT_MEMORY_AND_IO; | 296 | link->conf.IntType = INT_MEMORY_AND_IO; |
285 | link->conf.ConfigIndex = 1; | 297 | link->conf.ConfigIndex = 1; |
286 | 298 | ||
287 | /* The EL3-specific entries in the device structure. */ | 299 | dev->netdev_ops = &el3_netdev_ops; |
288 | dev->hard_start_xmit = &el3_start_xmit; | ||
289 | dev->get_stats = &el3_get_stats; | ||
290 | dev->do_ioctl = &el3_ioctl; | ||
291 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); | 300 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); |
292 | dev->set_multicast_list = &set_rx_mode; | ||
293 | dev->open = &el3_open; | ||
294 | dev->stop = &el3_close; | ||
295 | #ifdef HAVE_TX_TIMEOUT | ||
296 | dev->tx_timeout = el3_tx_timeout; | ||
297 | dev->watchdog_timeo = TX_TIMEOUT; | 301 | dev->watchdog_timeo = TX_TIMEOUT; |
298 | #endif | ||
299 | 302 | ||
300 | return tc574_config(link); | 303 | return tc574_config(link); |
301 | } /* tc574_attach */ | 304 | } /* tc574_attach */ |