From patchwork Fri Apr 17 01:48:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26107 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 3B2D2B6F35 for ; Fri, 17 Apr 2009 11:48:57 +1000 (EST) Received: by ozlabs.org (Postfix) id 2BB8ADE17C; Fri, 17 Apr 2009 11:48:57 +1000 (EST) 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 86692DE17B for ; Fri, 17 Apr 2009 11:48:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755175AbZDQBs1 (ORCPT ); Thu, 16 Apr 2009 21:48:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753064AbZDQBs1 (ORCPT ); Thu, 16 Apr 2009 21:48:27 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:64223 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752307AbZDQBs0 (ORCPT ); Thu, 16 Apr 2009 21:48:26 -0400 Received: by bwz17 with SMTP id 17so680224bwz.37 for ; Thu, 16 Apr 2009 18:48: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:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=y6e0/YITbZ3qsH01817tpFj0ekh7OVZd/Rq8lN5lPvg=; b=jX8SXk7JXxJU65tmmZRwzNJZXcEkb4mAW85U1UgahxvSmTeFHe/WpRi/XMAIi+WWI+ hRjcie9jhl3Zv96JMr9Wv3ZJeNJiHFD4WttWwQtTY5jXsiVozBIQQ2OnIY5UBB/XCi/W x9xuJ+vlFqcSL8R7Zzwox+oZXiPpNsYC8aQ/k= 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=KOgvvRhrBgXtif+0JwgfBR7hN3X/Aov8U4/oH8A8GQO9iwB8IWZgh9bNG46AaplZmE k1Wn9PHsFGNfCqE8JlRbV2MbtGS56RdYyAs1mK/1p3Ts9B79REpuu7Vll0WCBYlhIgNb pOL+KNtrgo1iWHk8Hm8bcnsKga0jPys4LZ7Ac= Received: by 10.204.120.201 with SMTP id e9mr1788884bkr.187.1239932904835; Thu, 16 Apr 2009 18:48:24 -0700 (PDT) Received: from orion (ppp83-237-112-50.pppoe.mtu-net.ru [83.237.112.50]) by mx.google.com with ESMTPS id c28sm2399587fka.32.2009.04.16.18.48.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 16 Apr 2009 18:48:24 -0700 (PDT) Date: Fri, 17 Apr 2009 05:48:17 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: Re: [PATCH -next 1/2] wan/pc300_drv: convert to net_device_ops Message-ID: <20090417014817.GA30721@orion> References: <1239931383-30525-1-git-send-email-a.beregalov@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1239931383-30525-1-git-send-email-a.beregalov@gmail.com> 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 On Fri, Apr 17, 2009 at 05:23:02AM +0400, Alexander Beregalov wrote: > > Signed-off-by: Alexander Beregalov > --- > drivers/net/wan/pc300_drv.c | 22 ++++++++++++++-------- > 1 files changed, 14 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c > index c23fde0..df10a4c 100644 > --- a/drivers/net/wan/pc300_drv.c > +++ b/drivers/net/wan/pc300_drv.c > @@ -225,6 +225,7 @@ static char rcsid[] = > #include > #include > #include > +#include > #include > #include > #include > @@ -3246,6 +3247,18 @@ static inline void show_version(void) > rcsvers, rcsdate, __DATE__, __TIME__); > } /* show_version */ > > +static const struct net_device_ops cpc_netdev_ops = { > + .ndo_init = NULL, > + .ndo_open = cpc_open, > + .ndo_stop = cpc_close, > + .ndo_tx_timeout = cpc_tx_timeout, > + .ndo_set_multicast_list = NULL, In this case ndo_init and ndo_set_multicast_list are not needed. From 1507a5a797a5f0005696a9bf10e390caca9c3800 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Fri, 17 Apr 2009 05:45:48 +0400 Subject: [PATCH] wan/pc300_drv: convert to net_device_ops Signed-off-by: Alexander Beregalov --- drivers/net/wan/pc300_drv.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index c23fde0..79dabc5 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c @@ -225,6 +225,7 @@ static char rcsid[] = #include #include #include +#include #include #include #include @@ -3246,6 +3247,16 @@ static inline void show_version(void) rcsvers, rcsdate, __DATE__, __TIME__); } /* show_version */ +static const struct net_device_ops cpc_netdev_ops = { + .ndo_open = cpc_open, + .ndo_stop = cpc_close, + .ndo_tx_timeout = cpc_tx_timeout, + .ndo_set_mac_address = NULL, + .ndo_change_mtu = cpc_change_mtu, + .ndo_do_ioctl = cpc_ioctl, + .ndo_validate_addr = eth_validate_addr, +}; + static void cpc_init_card(pc300_t * card) { int i, devcount = 0; @@ -3357,18 +3368,11 @@ static void cpc_init_card(pc300_t * card) dev->mem_start = card->hw.ramphys; dev->mem_end = card->hw.ramphys + card->hw.ramsize - 1; dev->irq = card->hw.irq; - dev->init = NULL; dev->tx_queue_len = PC300_TX_QUEUE_LEN; dev->mtu = PC300_DEF_MTU; - dev->open = cpc_open; - dev->stop = cpc_close; - dev->tx_timeout = cpc_tx_timeout; + dev->netdev_ops = &cpc_netdev_ops; dev->watchdog_timeo = PC300_TX_TIMEOUT; - dev->set_multicast_list = NULL; - dev->set_mac_address = NULL; - dev->change_mtu = cpc_change_mtu; - dev->do_ioctl = cpc_ioctl; if (register_hdlc_device(dev) == 0) { printk("%s: Cyclades-PC300/", dev->name);