From patchwork Wed Apr 15 22:52:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26041 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 59502DE201 for ; Thu, 16 Apr 2009 08:54:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756900AbZDOWyV (ORCPT ); Wed, 15 Apr 2009 18:54:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756630AbZDOWx6 (ORCPT ); Wed, 15 Apr 2009 18:53:58 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:38008 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756661AbZDOWxb (ORCPT ); Wed, 15 Apr 2009 18:53:31 -0400 Received: by bwz17 with SMTP id 17so114740bwz.37 for ; Wed, 15 Apr 2009 15:53:28 -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:in-reply-to:references; bh=KAFxAnkTB2eD0rk7j+Wvt96HRgnl07VT/eBfwVQ9mNs=; b=YRsT/4MvBC9u617Z8hV+LkZk/W7EiZhHUuEfPVgLi1T+K2LeoZ3qqqXjYleVa395eO SZYVlluCaq/jhOio4XWh+L+7mAncZcYrmWKrpAKdEdVtXbw9VYqY8Li71eYnw/BYiy5A LYEZE+zg1MnKkzRwgrBvVfcjot58HBZRBSSiU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=dCRBjYsaZg3Tod2YYqZUE2f+mp7F8TWFMX7Q1bMDshTNAlaYtqGOC1FvpwDmYYbLCu 5rcL7ajTsMIQV+pdjyQJsPs+aUA4MvLSEKe6G6yf3+yNr1c2NHkBx21wdA+lqdD4FwUs eVTFmezQf7V2MYLKsBusJE/Umcl9nNBfmiznI= Received: by 10.103.220.18 with SMTP id x18mr424673muq.38.1239836008841; Wed, 15 Apr 2009 15:53:28 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-133-38.pppoe.mtu-net.ru [91.76.133.38]) by mx.google.com with ESMTPS id n7sm720179mue.36.2009.04.15.15.53.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:28 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 21/26] pci-skeleton: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:55 +0400 Message-Id: <1239835980-22502-21-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-20-git-send-email-a.beregalov@gmail.com> References: <1239835980-22502-1-git-send-email-a.beregalov@gmail.com> <1239835980-22502-2-git-send-email-a.beregalov@gmail.com> <1239835980-22502-3-git-send-email-a.beregalov@gmail.com> <1239835980-22502-4-git-send-email-a.beregalov@gmail.com> <1239835980-22502-5-git-send-email-a.beregalov@gmail.com> <1239835980-22502-6-git-send-email-a.beregalov@gmail.com> <1239835980-22502-7-git-send-email-a.beregalov@gmail.com> <1239835980-22502-8-git-send-email-a.beregalov@gmail.com> <1239835980-22502-9-git-send-email-a.beregalov@gmail.com> <1239835980-22502-10-git-send-email-a.beregalov@gmail.com> <1239835980-22502-11-git-send-email-a.beregalov@gmail.com> <1239835980-22502-12-git-send-email-a.beregalov@gmail.com> <1239835980-22502-13-git-send-email-a.beregalov@gmail.com> <1239835980-22502-14-git-send-email-a.beregalov@gmail.com> <1239835980-22502-15-git-send-email-a.beregalov@gmail.com> <1239835980-22502-16-git-send-email-a.beregalov@gmail.com> <1239835980-22502-17-git-send-email-a.beregalov@gmail.com> <1239835980-22502-18-git-send-email-a.beregalov@gmail.com> <1239835980-22502-19-git-send-email-a.beregalov@gmail.com> <1239835980-22502-20-git-send-email-a.beregalov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/pci-skeleton.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index c95fd72..8c1f698 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c @@ -728,6 +728,17 @@ err_out: return rc; } +static const struct net_device_ops netdrv_netdev_ops = { + .ndo_open = netdrv_open, + .ndo_stop = netdrv_close, + .ndo_start_xmit = netdrv_start_xmit, + .ndo_set_multicast_list = netdrv_set_rx_mode, + .ndo_do_ioctl = netdrv_ioctl, + .ndo_tx_timeout = netdrv_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; static int __devinit netdrv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) @@ -769,13 +780,7 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev, ((u16 *) (dev->dev_addr))[i] = le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len)); - /* The Rtl8139-specific entries in the device structure. */ - dev->open = netdrv_open; - dev->hard_start_xmit = netdrv_start_xmit; - dev->stop = netdrv_close; - dev->set_multicast_list = netdrv_set_rx_mode; - dev->do_ioctl = netdrv_ioctl; - dev->tx_timeout = netdrv_tx_timeout; + dev->netdev_ops = &netdrv_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; dev->irq = pdev->irq;