From patchwork Wed Apr 15 22:52: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: 26029 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 F3C18DE13C for ; Thu, 16 Apr 2009 08:54:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756546AbZDOWxk (ORCPT ); Wed, 15 Apr 2009 18:53:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753524AbZDOWxi (ORCPT ); Wed, 15 Apr 2009 18:53:38 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:50591 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756565AbZDOWx2 (ORCPT ); Wed, 15 Apr 2009 18:53:28 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114640bwz.37 for ; Wed, 15 Apr 2009 15:53:27 -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=11t90oqyzLyjvGohAsS7x2rH8xuh+aa8ym3AltoRW6Q=; b=F0bshgQg9S7SMGpbMmYKqtu5xCEfR+CPNguEKPabJ5yqUZHxjuCQTpcKDQZQFSDR3W tSVge5n7udLAZe9Ym6x1DGeSBM89LY7ay/fLOsjdumczbBK3ak5rNWyIA6YQDnJWlJFS /R+POoRVpMLO+/dRLK038xpuH8SYnt58hK2Q8= 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=E0vy4DwbKtIPzHpHDf8rDahg8jj5dVYTf52AtHhJ+WSKPXENqObCCplRfHaa/t4Kuj YL9GMe9+j5/N03Q4Kaab0s+0NUwiWFW/kFVZ35M8Z/9E1ZK1F3S901xwXpIBeQuS82HU hNzh/DQwD/6y6GbpXcxdlCtQv9sZcMT3n1feQ= Received: by 10.103.174.16 with SMTP id b16mr426640mup.28.1239836007721; Wed, 15 Apr 2009 15:53:27 -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.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:27 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 20/26] pasemi_mac: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:54 +0400 Message-Id: <1239835980-22502-20-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-19-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/pasemi_mac.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index 5eeb5a8..067caba 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c @@ -1735,6 +1735,19 @@ out: return ret; } +static const struct net_device_ops pasemi_netdev_ops = { + .ndo_open = pasemi_mac_open, + .ndo_stop = pasemi_mac_close, + .ndo_start_xmit = pasemi_mac_start_tx, + .ndo_set_multicast_list = pasemi_mac_set_rx_mode, + .ndo_set_mac_address = pasemi_mac_set_mac_addr, + .ndo_change_mtu = pasemi_mac_change_mtu, + .ndo_validate_addr = eth_validate_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = pasemi_mac_netpoll, +#endif +}; + static int __devinit pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -1817,19 +1830,11 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto out; } - dev->open = pasemi_mac_open; - dev->stop = pasemi_mac_close; - dev->hard_start_xmit = pasemi_mac_start_tx; - dev->set_multicast_list = pasemi_mac_set_rx_mode; - dev->set_mac_address = pasemi_mac_set_mac_addr; + dev->netdev_ops = &pasemi_netdev_ops; dev->mtu = PE_DEF_MTU; /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */ mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = pasemi_mac_netpoll; -#endif - dev->change_mtu = pasemi_mac_change_mtu; dev->ethtool_ops = &pasemi_mac_ethtool_ops; if (err)