diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-03-20 15:36:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-22 01:51:21 -0400 |
commit | 2bd9f54d46e28fdaa15240af6a97c953720ea5c1 (patch) | |
tree | bb05c8561223bb6c8519a52315f9618915174f30 /drivers/net/wireless/zd1201.c | |
parent | 22bc1ce4f171f53c27052e1d74d312345487db16 (diff) |
zd1201: convert 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/wireless/zd1201.c')
-rw-r--r-- | drivers/net/wireless/zd1201.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 4d5f143cd58..9b244c96b22 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -1717,6 +1717,18 @@ static const struct iw_handler_def zd1201_iw_handlers = { | |||
1717 | .get_wireless_stats = zd1201_get_wireless_stats, | 1717 | .get_wireless_stats = zd1201_get_wireless_stats, |
1718 | }; | 1718 | }; |
1719 | 1719 | ||
1720 | static const struct net_device_ops zd1201_netdev_ops = { | ||
1721 | .ndo_open = zd1201_net_open, | ||
1722 | .ndo_stop = zd1201_net_stop, | ||
1723 | .ndo_start_xmit = zd1201_hard_start_xmit, | ||
1724 | .ndo_tx_timeout = zd1201_tx_timeout, | ||
1725 | .ndo_set_multicast_list = zd1201_set_multicast, | ||
1726 | .ndo_set_mac_address = zd1201_set_mac_address, | ||
1727 | .ndo_change_mtu = eth_change_mtu, | ||
1728 | .ndo_set_mac_address = eth_mac_addr, | ||
1729 | .ndo_validate_addr = eth_validate_addr, | ||
1730 | }; | ||
1731 | |||
1720 | static int zd1201_probe(struct usb_interface *interface, | 1732 | static int zd1201_probe(struct usb_interface *interface, |
1721 | const struct usb_device_id *id) | 1733 | const struct usb_device_id *id) |
1722 | { | 1734 | { |
@@ -1769,14 +1781,9 @@ static int zd1201_probe(struct usb_interface *interface, | |||
1769 | if (err) | 1781 | if (err) |
1770 | goto err_start; | 1782 | goto err_start; |
1771 | 1783 | ||
1772 | dev->open = zd1201_net_open; | 1784 | dev->netdev_ops = &zd1201_netdev_ops; |
1773 | dev->stop = zd1201_net_stop; | ||
1774 | dev->wireless_handlers = &zd1201_iw_handlers; | 1785 | dev->wireless_handlers = &zd1201_iw_handlers; |
1775 | dev->hard_start_xmit = zd1201_hard_start_xmit; | ||
1776 | dev->watchdog_timeo = ZD1201_TX_TIMEOUT; | 1786 | dev->watchdog_timeo = ZD1201_TX_TIMEOUT; |
1777 | dev->tx_timeout = zd1201_tx_timeout; | ||
1778 | dev->set_multicast_list = zd1201_set_multicast; | ||
1779 | dev->set_mac_address = zd1201_set_mac_address; | ||
1780 | strcpy(dev->name, "wlan%d"); | 1787 | strcpy(dev->name, "wlan%d"); |
1781 | 1788 | ||
1782 | err = zd1201_getconfig(zd, ZD1201_RID_CNFOWNMACADDR, | 1789 | err = zd1201_getconfig(zd, ZD1201_RID_CNFOWNMACADDR, |