From patchwork Fri Apr 17 01:23:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26104 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 37444B6F44 for ; Fri, 17 Apr 2009 11:23:22 +1000 (EST) Received: by ozlabs.org (Postfix) id 2343DDE164; Fri, 17 Apr 2009 11:23:22 +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 B612CDE163 for ; Fri, 17 Apr 2009 11:23:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756543AbZDQBXL (ORCPT ); Thu, 16 Apr 2009 21:23:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757546AbZDQBXJ (ORCPT ); Thu, 16 Apr 2009 21:23:09 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:32483 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757370AbZDQBXH (ORCPT ); Thu, 16 Apr 2009 21:23:07 -0400 Received: by fg-out-1718.google.com with SMTP id e12so223620fga.17 for ; Thu, 16 Apr 2009 18:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=yb/JmbFtKPjTZDEEogP2sGlpjZw0vsHX3XW2QF7tFD0=; b=vCdAjkgZT3azjDt6TdmqadXkZffOBYITieqRwL+Kgwl1Gol+WPGt1s/03Q2ex7Y1jb 53GRBP7FxVKuaNIitTYT8LK1XB/hRrIh3bWF4+HumysYamb0qddcJF6L4BbV0nA/wsEW /YsZwdPa9wRm4vPUvwex/oVd+vkUjzBjsbwdY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=GJ/ZhtxTjwasRiJ6ctMmhGRVispr8BHrUfxClk5Hk6JTsU6Y+LN32ImxP6xZQ2O1AN SXNFf5ByjwsqTUUTPYFWuiGMtTzijKYe2bnEUIQvFLYMBTWTnOBfQ5sqcuoQOS6Nf1ry tLpVLyBQu6rmLv9J9/K9ERwC8RPF65ffeVwN4= Received: by 10.86.62.3 with SMTP id k3mr1635299fga.27.1239931385744; Thu, 16 Apr 2009 18:23:05 -0700 (PDT) Received: from localhost.localdomain (ppp83-237-112-50.pppoe.mtu-net.ru [83.237.112.50]) by mx.google.com with ESMTPS id d4sm2492130fga.23.2009.04.16.18.23.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 16 Apr 2009 18:23:05 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH -next 1/2] wan/pc300_drv: convert to net_device_ops Date: Fri, 17 Apr 2009 05:23:02 +0400 Message-Id: <1239931383-30525-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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, + .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 +3370,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);