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

Commit 1703338c authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

usbnet: convert asix 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 777baa47

drivers/net/usb/asix.c

+40 −7
Original line number Diff line number Diff line
@@ -807,6 +807,18 @@ static int ax88172_link_reset(struct usbnet *dev) 
	return 0;

}



static const struct net_device_ops ax88172_netdev_ops = {

	.ndo_open		= usbnet_open,

	.ndo_stop		= usbnet_stop,

	.ndo_start_xmit		= usbnet_start_xmit,

	.ndo_tx_timeout		= usbnet_tx_timeout,

	.ndo_change_mtu		= usbnet_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_do_ioctl		= asix_ioctl,

	.ndo_set_multicast_list = ax88172_set_multicast,

};



static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf)

{

	int ret = 0;
@@ -846,9 +858,8 @@ static int ax88172_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->mii.phy_id_mask = 0x3f;

	dev->mii.reg_num_mask = 0x1f;

	dev->mii.phy_id = asix_get_phy_addr(dev);

	dev->net->do_ioctl = asix_ioctl;



	dev->net->set_multicast_list = ax88172_set_multicast;

	dev->net->netdev_ops = &ax88172_netdev_ops;

	dev->net->ethtool_ops = &ax88172_ethtool_ops;



	asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
@@ -898,6 +909,18 @@ static int ax88772_link_reset(struct usbnet *dev) 
	return 0;

}



static const struct net_device_ops ax88772_netdev_ops = {

	.ndo_open		= usbnet_open,

	.ndo_stop		= usbnet_stop,

	.ndo_start_xmit		= usbnet_start_xmit,

	.ndo_tx_timeout		= usbnet_tx_timeout,

	.ndo_change_mtu		= usbnet_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_do_ioctl		= asix_ioctl,

	.ndo_set_multicast_list = asix_set_multicast,

};



static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)

{

	int ret, embd_phy;
@@ -962,7 +985,6 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->mii.mdio_write = asix_mdio_write;

	dev->mii.phy_id_mask = 0x1f;

	dev->mii.reg_num_mask = 0x1f;

	dev->net->do_ioctl = asix_ioctl;

	dev->mii.phy_id = asix_get_phy_addr(dev);



	phyid = asix_get_phyid(dev);
@@ -978,7 +1000,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) 


	msleep(150);



	dev->net->set_multicast_list = asix_set_multicast;

	dev->net->netdev_ops = &ax88772_netdev_ops;

	dev->net->ethtool_ops = &ax88772_ethtool_ops;



	asix_mdio_write(dev->net, dev->mii.phy_id, MII_BMCR, BMCR_RESET);
@@ -1181,6 +1203,18 @@ static int ax88178_change_mtu(struct net_device *net, int new_mtu) 
	return 0;

}



static const struct net_device_ops ax88178_netdev_ops = {

	.ndo_open		= usbnet_open,

	.ndo_stop		= usbnet_stop,

	.ndo_start_xmit		= usbnet_start_xmit,

	.ndo_tx_timeout		= usbnet_tx_timeout,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_multicast_list = asix_set_multicast,

	.ndo_do_ioctl 		= asix_ioctl,

	.ndo_change_mtu 	= ax88178_change_mtu,

};



static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf)

{

	struct asix_data *data = (struct asix_data *)&dev->data;
@@ -1247,11 +1281,10 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->mii.phy_id_mask = 0x1f;

	dev->mii.reg_num_mask = 0xff;

	dev->mii.supports_gmii = 1;

	dev->net->do_ioctl = asix_ioctl;

	dev->mii.phy_id = asix_get_phy_addr(dev);

	dev->net->set_multicast_list = asix_set_multicast;



	dev->net->netdev_ops = &ax88178_netdev_ops;

	dev->net->ethtool_ops = &ax88178_ethtool_ops;

	dev->net->change_mtu = &ax88178_change_mtu;



	phyid = asix_get_phyid(dev);

	dbg("PHYID=0x%08x", phyid);