From patchwork Sat Mar 21 05:36:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24833 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 39B50DDED1 for ; Sat, 21 Mar 2009 16:54:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760539AbZCUFvh (ORCPT ); Sat, 21 Mar 2009 01:51:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761922AbZCUFvf (ORCPT ); Sat, 21 Mar 2009 01:51:35 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36670 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760821AbZCUFsU (ORCPT ); Sat, 21 Mar 2009 01:48:20 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2L5mHKj027266; Fri, 20 Mar 2009 22:48:17 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5mHRX027265; Fri, 20 Mar 2009 22:48:17 -0700 Message-Id: <20090321053716.736316447@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:36:22 -0700 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: [PATCH 55/77] netwave: convert to net_device_ops Content-Disposition: inline; filename=netwave.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Also get rid of unneeded cast Signed-off-by: Stephen Hemminger --- a/drivers/net/wireless/netwave_cs.c 2009-03-20 22:14:37.954403178 -0700 +++ b/drivers/net/wireless/netwave_cs.c 2009-03-20 22:15:57.752963633 -0700 @@ -355,6 +355,17 @@ static struct iw_statistics *netwave_get return &priv->iw_stats; } +static const struct net_device_ops netwave_netdev_ops = { + .ndo_open = netwave_open, + .ndo_stop = netwave_close, + .ndo_start_xmit = netwave_start_xmit, + .ndo_set_multicast_list = set_multicast_list, + .ndo_tx_timeout = netwave_watchdog, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + /* * Function netwave_attach (void) * @@ -403,16 +414,12 @@ static int netwave_probe(struct pcmcia_d spin_lock_init(&priv->spinlock); /* Netwave specific entries in the device structure */ - dev->hard_start_xmit = &netwave_start_xmit; - dev->set_multicast_list = &set_multicast_list; + dev->netdev_ops = &netwave_netdev_ops; /* wireless extensions */ - dev->wireless_handlers = (struct iw_handler_def *)&netwave_handler_def; + dev->wireless_handlers = &netwave_handler_def; - dev->tx_timeout = &netwave_watchdog; dev->watchdog_timeo = TX_TIMEOUT; - dev->open = &netwave_open; - dev->stop = &netwave_close; link->irq.Instance = dev; return netwave_pcmcia_config( link);