From patchwork Sat Apr 11 17:38:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25857 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 7C3B6DE011 for ; Sun, 12 Apr 2009 03:39:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756307AbZDKRjG (ORCPT ); Sat, 11 Apr 2009 13:39:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754721AbZDKRjE (ORCPT ); Sat, 11 Apr 2009 13:39:04 -0400 Received: from an-out-0708.google.com ([209.85.132.244]:1040 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbZDKRjC (ORCPT ); Sat, 11 Apr 2009 13:39:02 -0400 Received: by an-out-0708.google.com with SMTP id d14so1349651and.1 for ; Sat, 11 Apr 2009 10:39:00 -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:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=w2zx5iuKVBItYmqw0sTQje6MFbUprAoI8/05zSQFMVI=; b=x3tlGmsxWXU63FtuaoXkmbI6f58D/hpSD5yeRdZRhAktfjPvHR0l6LXluuG6TMFOaB 63XQjz5dJQ+8m8JIc15qxE9XsrANonALhC/HzD8UGIUIPnJZBVaEE7WIyQ3VM0hQ6FWI HTfNMkYwe4NTYLE622A1fviazsLCofYVS36RA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=CAAu6HZAqt/ftNLjegWKVfSmAMDWKPThgmKQQh233dxr/KitTepggkAlSfKiMCYhfN Hlc3G2Nz5qyf7uahEdLqzXbr6rUa5J2e2nVkUnq/ZrlrsRKA0byXckPZ3V54DPvu6uMT 6Oq73HiPL6YWqdKVRCARQQLL80NuTftpe7F14= Received: by 10.100.248.16 with SMTP id v16mr606766anh.60.1239471540804; Sat, 11 Apr 2009 10:39:00 -0700 (PDT) Received: from orion ([91.78.156.47]) by mx.google.com with ESMTPS id 6sm1877519ywi.35.2009.04.11.10.38.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Apr 2009 10:39:00 -0700 (PDT) Date: Sat, 11 Apr 2009 21:38:54 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: [PATCH 03/11] tc35815: convert to net_device_ops Message-ID: <20090411173854.GC16999@orion> References: <20090411173019.GA16999@orion> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090411173019.GA16999@orion> 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 --- drivers/net/tc35815.c | 27 +++++++++++++++++---------- 1 files changed, 17 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/net/tc35815.c b/drivers/net/tc35815.c index d91e95b..0ce2db6 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -862,6 +862,22 @@ static int __devinit tc35815_init_dev_addr(struct net_device *dev) return 0; } +static const struct net_device_ops tc35815_netdev_ops = { + .ndo_open = tc35815_open, + .ndo_stop = tc35815_close, + .ndo_start_xmit = tc35815_send_packet, + .ndo_get_stats = tc35815_get_stats, + .ndo_set_multicast_list = tc35815_set_multicast_list, + .ndo_tx_timeout = tc35815_tx_timeout, + .ndo_do_ioctl = tc35815_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = tc35815_poll_controller, +#endif +}; + static int __devinit tc35815_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -904,21 +920,12 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev, ioaddr = pcim_iomap_table(pdev)[1]; /* Initialize the device structure. */ - dev->open = tc35815_open; - dev->hard_start_xmit = tc35815_send_packet; - dev->stop = tc35815_close; - dev->get_stats = tc35815_get_stats; - dev->set_multicast_list = tc35815_set_multicast_list; - dev->do_ioctl = tc35815_ioctl; + dev->netdev_ops = &tc35815_netdev_ops; dev->ethtool_ops = &tc35815_ethtool_ops; - dev->tx_timeout = tc35815_tx_timeout; dev->watchdog_timeo = TC35815_TX_TIMEOUT; #ifdef TC35815_NAPI netif_napi_add(dev, &lp->napi, tc35815_poll, NAPI_WEIGHT); #endif -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = tc35815_poll_controller; -#endif dev->irq = pdev->irq; dev->base_addr = (unsigned long)ioaddr;