Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496f98cd authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

pcmcia: convert fmvj18x driver to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d63cd426

drivers/net/pcmcia/fmvj18x_cs.c

+14 −9
Original line number Diff line number Diff line
@@ -227,6 +227,18 @@ typedef struct local_info_t { 
#define BANK_1U              0x24 /* bank 1 (CONFIG_1) */

#define BANK_2U              0x28 /* bank 2 (CONFIG_1) */



static const struct net_device_ops fjn_netdev_ops = {

	.ndo_open 		= fjn_open,

	.ndo_stop		= fjn_close,

	.ndo_start_xmit 	= fjn_start_xmit,

	.ndo_tx_timeout 	= fjn_tx_timeout,

	.ndo_set_config 	= fjn_config,

	.ndo_set_multicast_list = set_rx_mode,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

};



static int fmvj18x_probe(struct pcmcia_device *link)

{

    local_info_t *lp;
@@ -258,16 +270,9 @@ static int fmvj18x_probe(struct pcmcia_device *link) 
    link->conf.Attributes = CONF_ENABLE_IRQ;

    link->conf.IntType = INT_MEMORY_AND_IO;



    /* The FMVJ18x specific entries in the device structure. */

    dev->hard_start_xmit = &fjn_start_xmit;

    dev->set_config = &fjn_config;

    dev->set_multicast_list = &set_rx_mode;

    dev->open = &fjn_open;

    dev->stop = &fjn_close;

#ifdef HAVE_TX_TIMEOUT

    dev->tx_timeout = fjn_tx_timeout;

    dev->netdev_ops = &fjn_netdev_ops;

    dev->watchdog_timeo = TX_TIMEOUT;

#endif



    SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);



    return fmvj18x_config(link);