From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from suva.vyatta.com ([76.74.103.44]:36736 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760301AbZCUFs3 (ORCPT ); Sat, 21 Mar 2009 01:48:29 -0400 Message-Id: <20090321053717.204864141@vyatta.com> (sfid-20090321_065124_348143_39E17321) References: <20090321053527.316395697@vyatta.com> Date: Fri, 20 Mar 2009 22:36:28 -0700 From: Stephen Hemminger To: David Miller , coreythomas@charter.net Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 61/77] raylan: convert to net_device_ops Sender: linux-wireless-owner@vger.kernel.org List-ID: Signed-off-by: Stephen Hemminger --- a/drivers/net/wireless/ray_cs.c 2009-03-20 22:14:19.352839145 -0700 +++ b/drivers/net/wireless/ray_cs.c 2009-03-20 22:25:55.863652814 -0700 @@ -298,6 +298,19 @@ static char hop_pattern_length[] = { 1, static char rcsid[] = "Raylink/WebGear wireless LAN - Corey "; +static const struct net_device_ops ray_netdev_ops = { + .ndo_init = ray_dev_init, + .ndo_open = ray_open, + .ndo_stop = ray_dev_close, + .ndo_start_xmit = ray_dev_start_xmit, + .ndo_set_config = ray_dev_config, + .ndo_get_stats = ray_get_stats, + .ndo_set_multicast_list = set_multicast_list, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + /*============================================================================= ray_attach() creates an "instance" of the driver, allocating local data structures for one device. The device is registered @@ -347,9 +360,7 @@ static int ray_probe(struct pcmcia_devic p_dev, dev, local, &ray_interrupt); /* Raylink entries in the device structure */ - dev->hard_start_xmit = &ray_dev_start_xmit; - dev->set_config = &ray_dev_config; - dev->get_stats = &ray_get_stats; + dev->netdev_ops = &ray_netdev_ops; SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); dev->wireless_handlers = &ray_handler_def; #ifdef WIRELESS_SPY @@ -357,12 +368,8 @@ static int ray_probe(struct pcmcia_devic dev->wireless_data = &local->wireless_data; #endif /* WIRELESS_SPY */ - dev->set_multicast_list = &set_multicast_list; DEBUG(2, "ray_cs ray_attach calling ether_setup.)\n"); - dev->init = &ray_dev_init; - dev->open = &ray_open; - dev->stop = &ray_dev_close; netif_stop_queue(dev); init_timer(&local->timer); --