aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-03-20 15:36:04 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-21 22:55:38 -0400
commit496f98cd5687770f4cb463c300510016dfbc81f6 (patch)
treedce64778ce5514273928be68d48f47d6257a139e /drivers/net/pcmcia
parentd63cd426ba55a9e02ab745612357ee00158824a5 (diff)
pcmcia: convert fmvj18x driver 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/fmvj18x_cs.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 6715188319d..81e6660a433 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -227,6 +227,18 @@ typedef struct local_info_t {
227#define BANK_1U 0x24 /* bank 1 (CONFIG_1) */ 227#define BANK_1U 0x24 /* bank 1 (CONFIG_1) */
228#define BANK_2U 0x28 /* bank 2 (CONFIG_1) */ 228#define BANK_2U 0x28 /* bank 2 (CONFIG_1) */
229 229
230static const struct net_device_ops fjn_netdev_ops = {
231 .ndo_open = fjn_open,
232 .ndo_stop = fjn_close,
233 .ndo_start_xmit = fjn_start_xmit,
234 .ndo_tx_timeout = fjn_tx_timeout,
235 .ndo_set_config = fjn_config,
236 .ndo_set_multicast_list = set_rx_mode,
237 .ndo_change_mtu = eth_change_mtu,
238 .ndo_set_mac_address = eth_mac_addr,
239 .ndo_validate_addr = eth_validate_addr,
240};
241
230static int fmvj18x_probe(struct pcmcia_device *link) 242static int fmvj18x_probe(struct pcmcia_device *link)
231{ 243{
232 local_info_t *lp; 244 local_info_t *lp;
@@ -258,16 +270,9 @@ static int fmvj18x_probe(struct pcmcia_device *link)
258 link->conf.Attributes = CONF_ENABLE_IRQ; 270 link->conf.Attributes = CONF_ENABLE_IRQ;
259 link->conf.IntType = INT_MEMORY_AND_IO; 271 link->conf.IntType = INT_MEMORY_AND_IO;
260 272
261 /* The FMVJ18x specific entries in the device structure. */ 273 dev->netdev_ops = &fjn_netdev_ops;
262 dev->hard_start_xmit = &fjn_start_xmit;
263 dev->set_config = &fjn_config;
264 dev->set_multicast_list = &set_rx_mode;
265 dev->open = &fjn_open;
266 dev->stop = &fjn_close;
267#ifdef HAVE_TX_TIMEOUT
268 dev->tx_timeout = fjn_tx_timeout;
269 dev->watchdog_timeo = TX_TIMEOUT; 274 dev->watchdog_timeo = TX_TIMEOUT;
270#endif 275
271 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); 276 SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
272 277
273 return fmvj18x_config(link); 278 return fmvj18x_config(link);