From patchwork Fri Apr 10 03:24:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25824 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 4BB55DDF83 for ; Fri, 10 Apr 2009 13:24:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762711AbZDJDYO (ORCPT ); Thu, 9 Apr 2009 23:24:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762652AbZDJDYN (ORCPT ); Thu, 9 Apr 2009 23:24:13 -0400 Received: from fk-out-0910.google.com ([209.85.128.186]:36072 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761730AbZDJDYN (ORCPT ); Thu, 9 Apr 2009 23:24:13 -0400 Received: by fk-out-0910.google.com with SMTP id 18so398056fkq.5 for ; Thu, 09 Apr 2009 20:24:11 -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=edlrs7JXk0ec0QSLI0eTFjZd7WLjC56GEUOmrJd4zyU=; b=g857217iIPC1tuQ3vxDrA9T6SWHnIXwbRoy+2oDbH6HxBo+7IK6ANiJXJKV3BrxJ/J coRpy4ZuWqKI4VyHDFN+5eA47KcnkzClY5FopbwrHJD6EyR+6JJ+rNcGSlFv3IRwCCZb tMqb8N4cvQDjBbKktQrqJUPIoDBiRiGHxowac= 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=QWpqo5NYxRI+Zleb0tRexWYnrf8oppuimkm5R0MTtfZRynbnpS7bAz6E1/sJZRHpq5 jVGaS2rPd1LzianTik/h21qfbE598Jacsj58R2qfxURD91cq4dko1dybs9nyzredqp8c d3ivqz08IxV38j/T4jTyDDIGLymAY3UMCLlz0= Received: by 10.103.238.4 with SMTP id p4mr1621341mur.68.1239333850919; Thu, 09 Apr 2009 20:24:10 -0700 (PDT) Received: from orion (ppp91-78-23-81.pppoe.mtu-net.ru [91.78.23.81]) by mx.google.com with ESMTPS id e8sm2024851muf.48.2009.04.09.20.24.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 09 Apr 2009 20:24:10 -0700 (PDT) Date: Fri, 10 Apr 2009 07:24:07 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org, linux-m68k@lists.linux-m68k.org Subject: [PATCH 1/6] ariadne: convert to net_device_ops Message-ID: <20090410032407.GA9004@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: Geert Uytterhoeven --- drivers/net/ariadne.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 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/ariadne.c b/drivers/net/ariadne.c index e1d72e0..6c5826a 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c @@ -155,6 +155,18 @@ static struct zorro_driver ariadne_driver = { .remove = __devexit_p(ariadne_remove_one), }; +static const struct net_device_ops ariadne_netdev_ops = { + .ndo_open = ariadne_open, + .ndo_stop = ariadne_close, + .ndo_start_xmit = ariadne_start_xmit, + .ndo_tx_timeout = ariadne_tx_timeout, + .ndo_get_stats = ariadne_get_stats, + .ndo_set_multicast_list = set_multicast_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +}; + static int __devinit ariadne_init_one(struct zorro_dev *z, const struct zorro_device_id *ent) { @@ -197,13 +209,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z, dev->mem_start = ZTWO_VADDR(mem_start); dev->mem_end = dev->mem_start+ARIADNE_RAM_SIZE; - dev->open = &ariadne_open; - dev->stop = &ariadne_close; - dev->hard_start_xmit = &ariadne_start_xmit; - dev->tx_timeout = &ariadne_tx_timeout; + dev->netdev_ops = &ariadne_netdev_ops;; dev->watchdog_timeo = 5*HZ; - dev->get_stats = &ariadne_get_stats; - dev->set_multicast_list = &set_multicast_list; err = register_netdev(dev); if (err) {