From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from suva.vyatta.com ([76.74.103.44]:36703 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760920AbZCUFsX (ORCPT ); Sat, 21 Mar 2009 01:48:23 -0400 Message-Id: <20090321053717.514936473@vyatta.com> (sfid-20090321_065121_264448_94DAF6F3) References: <20090321053527.316395697@vyatta.com> Date: Fri, 20 Mar 2009 22:36:32 -0700 From: Stephen Hemminger To: David Miller , pe1rxq@amsat.org Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 65/77] zd1201: convert to net_device_ops Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Stephen Hemminger --- a/drivers/net/wireless/zd1201.c 2009-03-20 22:26:00.356902321 -0700 +++ b/drivers/net/wireless/zd1201.c 2009-03-20 22:26:01.715027053 -0700 @@ -1717,6 +1717,18 @@ static const struct iw_handler_def zd120 .get_wireless_stats = zd1201_get_wireless_stats, }; +static const struct net_device_ops zd1201_netdev_ops = { + .ndo_open = zd1201_net_open, + .ndo_stop = zd1201_net_stop, + .ndo_start_xmit = zd1201_hard_start_xmit, + .ndo_tx_timeout = zd1201_tx_timeout, + .ndo_set_multicast_list = zd1201_set_multicast, + .ndo_set_mac_address = zd1201_set_mac_address, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + static int zd1201_probe(struct usb_interface *interface, const struct usb_device_id *id) { @@ -1769,14 +1781,9 @@ static int zd1201_probe(struct usb_inter if (err) goto err_start; - dev->open = zd1201_net_open; - dev->stop = zd1201_net_stop; + dev->netdev_ops = &zd1201_netdev_ops; dev->wireless_handlers = &zd1201_iw_handlers; - dev->hard_start_xmit = zd1201_hard_start_xmit; dev->watchdog_timeo = ZD1201_TX_TIMEOUT; - dev->tx_timeout = zd1201_tx_timeout; - dev->set_multicast_list = zd1201_set_multicast; - dev->set_mac_address = zd1201_set_mac_address; strcpy(dev->name, "wlan%d"); err = zd1201_getconfig(zd, ZD1201_RID_CNFOWNMACADDR, --