From patchwork Sun Mar 29 15:27:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25284 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 6DA2EDDE25 for ; Mon, 30 Mar 2009 02:27:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758137AbZC2P13 (ORCPT ); Sun, 29 Mar 2009 11:27:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754932AbZC2P12 (ORCPT ); Sun, 29 Mar 2009 11:27:28 -0400 Received: from fg-out-1718.google.com ([72.14.220.158]:8993 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751346AbZC2P11 (ORCPT ); Sun, 29 Mar 2009 11:27:27 -0400 Received: by fg-out-1718.google.com with SMTP id 16so189032fgg.17 for ; Sun, 29 Mar 2009 08:27:24 -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=ihfEf3ZfLaQ4pOXDYOGr7n3dDeZu23+P7797rXai9Tc=; b=S8XYT1cQetG+kqdbj/hfE0r5S31XpssQib283e7qYnNHwSrFOU1E2DYAiKKf35qIgq 17SeSRw3sbgM7LHuP84w+BJ9qJlOeUt0qiLWC5D60ZwEUlc8j02SEJjfXcDu2cF8BTOm 4erBGL7c7/r5TjZaxOZ+3jHoAl7LT0g845s60= 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=hPca6XPVMD2REjMIF3ak0IlzimAbA1Z/5WdViZvVddMHmqTZpR18U7kHrs37QiMeYY yQJboN/RmOdD1d8RcKQYnd1wsnYhQnHs/PHKyMlWPmjRcMPlgReNwTQunCsWJNyaLzSm yRU09aHA7oExiRURDdpU/RVB9iCZpINgdxg/k= Received: by 10.86.36.17 with SMTP id j17mr3588367fgj.36.1238340444500; Sun, 29 Mar 2009 08:27:24 -0700 (PDT) Received: from orion (ppp91-76-231-215.pppoe.mtu-net.ru [91.76.231.215]) by mx.google.com with ESMTPS id 4sm2758752fge.28.2009.03.29.08.27.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 29 Mar 2009 08:27:24 -0700 (PDT) Date: Sun, 29 Mar 2009 19:27:21 +0400 From: Alexander Beregalov To: gregkh@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 5/10] Staging: rt2860: convert to netdev_ops Message-ID: <20090329152721.GE11056@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 Signed-off-by: Alexander Beregalov Acked-by: David S. Miller --- drivers/staging/rt2860/rt_main_dev.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 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/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c index cf17bcd..6c4396f 100644 --- a/drivers/staging/rt2860/rt_main_dev.c +++ b/drivers/staging/rt2860/rt_main_dev.c @@ -722,6 +722,20 @@ err: return (-1); } /* End of rt28xx_open */ +static const struct net_device_ops rt2860_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) @@ -733,11 +747,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 // #ifdef CONFIG_STA_SUPPORT #if WIRELESS_EXT >= 12 @@ -760,12 +769,8 @@ 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->priv_flags = INT_MAIN; - dev->do_ioctl = rt28xx_ioctl; - dev->validate_addr = NULL; + dev->netdev_ops = &rt2860_netdev_ops; // find available device name for (i = 0; i < 8; i++) {