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

Commit 5618f0d1 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

hydra: convert to net_device_ops 



Another device using 8390 library that needs converting.

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

drivers/net/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o 
obj-$(CONFIG_DECLANCE) += declance.o

obj-$(CONFIG_DECLANCE) += declance.o

obj-$(CONFIG_ATARILANCE) += atarilance.o

obj-$(CONFIG_ATARILANCE) += atarilance.o

obj-$(CONFIG_A2065) += a2065.o

obj-$(CONFIG_A2065) += a2065.o

obj-$(CONFIG_HYDRA) += hydra.o

obj-$(CONFIG_HYDRA) += hydra.o 8390.o

obj-$(CONFIG_ARIADNE) += ariadne.o

obj-$(CONFIG_ARIADNE) += ariadne.o

obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_MACSONIC) += macsonic.o

obj-$(CONFIG_MACSONIC) += macsonic.o

drivers/net/hydra.c

+17 −6
Original line number Original line Diff line number Diff line
@@ -94,6 +94,21 @@ static int __devinit hydra_init_one(struct zorro_dev *z, 
    return 0;

    return 0;

}

}





static const struct net_device_ops etherh_netdev_ops = {

	.ndo_open		= hydra_open,

	.ndo_stop		= hydra_close,



	.ndo_start_xmit		= ei_start_xmit,

	.ndo_tx_timeout		= ei_tx_timeout,

	.ndo_get_stats		= ei_get_stats,

	.ndo_set_multicast_list = ei_set_multicast_list,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= eth_change_mtu,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= ei_poll,

#endif

};



static int __devinit hydra_init(struct zorro_dev *z)

static int __devinit hydra_init(struct zorro_dev *z)

{

{

    struct net_device *dev;

    struct net_device *dev;
@@ -109,7 +124,7 @@ static int __devinit hydra_init(struct zorro_dev *z) 
	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,

	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,

    };

    };





    dev = ____alloc_ei_netdev(0);

    dev = alloc_ei_netdev();

    if (!dev)

    if (!dev)

	return -ENOMEM;

	return -ENOMEM;
@@ -144,12 +159,8 @@ static int __devinit hydra_init(struct zorro_dev *z) 
    ei_status.block_output = &hydra_block_output;

    ei_status.block_output = &hydra_block_output;

    ei_status.get_8390_hdr = &hydra_get_8390_hdr;

    ei_status.get_8390_hdr = &hydra_get_8390_hdr;

    ei_status.reg_offset = hydra_offsets;

    ei_status.reg_offset = hydra_offsets;

    dev->open = &hydra_open;

    dev->stop = &hydra_close;

#ifdef CONFIG_NET_POLL_CONTROLLER

    dev->poll_controller = __ei_poll;

#endif





    dev->netdev_ops = &hydra_netdev_ops;

    __NS8390_init(dev, 0);

    __NS8390_init(dev, 0);





    err = register_netdev(dev);

    err = register_netdev(dev);