From patchwork Sun Mar 29 15:29:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25286 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 30185DDDFA for ; Mon, 30 Mar 2009 02:29:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758333AbZC2P30 (ORCPT ); Sun, 29 Mar 2009 11:29:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757807AbZC2P3Z (ORCPT ); Sun, 29 Mar 2009 11:29:25 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:56629 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754932AbZC2P3Y (ORCPT ); Sun, 29 Mar 2009 11:29:24 -0400 Received: by bwz17 with SMTP id 17so1599129bwz.37 for ; Sun, 29 Mar 2009 08:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=E9LUqra/mTbkXlYEiP55WY9xnRcAl2D0GST6r01P46M=; b=d3y2kln2fU7UEaCUFp+ygvfbHLjGPaTn8aPrUozxOmfkpt4E/ZQlF9Hvdp4vPMCXif 0EIVMdIUJovAKnvuyo0aYcW5HB4HL5NW90ZAaStYqpX2Qd+QX+7UuEH0PhDzws3FPmai g4v702Rv2CMUfTY+kMktZgK6aGS9ROlloDIXA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=SRzbDKF26qaPrjiN0QQDHjYqyAvdC8fYyIEHbheWSxLZV3RgQJL1OSCt9CKERshpWL DdOh+yIuIhXUa044CnNjwITbZb4H84ojjRE6X6ZdUYJex5d1rQq/LU+nd85AuuUaxZ/Q 94djx+xofUMKTwp4h4V9WLVbEVdCLSOPURGLU= Received: by 10.204.60.148 with SMTP id p20mr1559998bkh.165.1238340561392; Sun, 29 Mar 2009 08:29:21 -0700 (PDT) Received: from orion (ppp91-76-231-215.pppoe.mtu-net.ru [91.76.231.215]) by mx.google.com with ESMTPS id f31sm1894374fkf.15.2009.03.29.08.29.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 29 Mar 2009 08:29:20 -0700 (PDT) Date: Sun, 29 Mar 2009 19:29:18 +0400 From: Alexander Beregalov To: gregkh@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 7/10] Staging: rt3070: convert to netdev_ops Message-ID: <20090329152918.GG11056@orion> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Also remove unused variable. Signed-off-by: Alexander Beregalov Acked-by: David S. Miller --- drivers/staging/rt3070/rt_main_dev.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/rt3070/rt_main_dev.c b/drivers/staging/rt3070/rt_main_dev.c index c000646..81f769c 100644 --- a/drivers/staging/rt3070/rt_main_dev.c +++ b/drivers/staging/rt3070/rt_main_dev.c @@ -436,7 +436,6 @@ static int rt28xx_init(IN struct net_device *net_dev) // OID_SET_HT_PHYMODE SetHT; // WPDMA_GLO_CFG_STRUC GloCfg; UINT32 MacCsr0 = 0; - UINT32 MacValue = 0; #ifdef RT2870 #ifdef INF_AMAZON_SE @@ -849,6 +848,20 @@ err: return (-1); } /* End of rt28xx_open */ +static const struct net_device_ops rt3070_netdev_ops = { + .ndo_open = MainVirtualIF_open, + .ndo_stop = MainVirtualIF_close, + .ndo_do_ioctl = rt28xx_ioctl, + .ndo_get_stats = RT28xx_get_ether_stats, + .ndo_validate_addr = NULL, + .ndo_set_mac_address = eth_mac_addr, + .ndo_change_mtu = eth_change_mtu, +#ifdef IKANOS_VX_1X0 + .ndo_start_xmit = IKANOS_DataFramesTx, +#else + .ndo_start_xmit = rt28xx_send_packets, +#endif +}; /* Must not be called for mdev and apdev */ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER pAd) @@ -860,12 +873,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p //ether_setup(dev); - dev->hard_start_xmit = rt28xx_send_packets; - -#ifdef IKANOS_VX_1X0 - dev->hard_start_xmit = IKANOS_DataFramesTx; -#endif // IKANOS_VX_1X0 // - // dev->set_multicast_list = ieee80211_set_multicast_list; // dev->change_mtu = ieee80211_change_mtu; #ifdef CONFIG_STA_SUPPORT @@ -889,16 +896,10 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p #if WIRELESS_EXT < 21 dev->get_wireless_stats = rt28xx_get_wireless_stats; #endif - dev->get_stats = RT28xx_get_ether_stats; - dev->open = MainVirtualIF_open; //rt28xx_open; - dev->stop = MainVirtualIF_close; //rt28xx_close; // dev->uninit = ieee80211_if_reinit; // dev->destructor = ieee80211_if_free; dev->priv_flags = INT_MAIN; - dev->do_ioctl = rt28xx_ioctl; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) - dev->validate_addr = NULL; -#endif + dev->netdev_ops = &rt3070_netdev_ops; // find available device name for (i = 0; i < 8; i++) {