From patchwork Wed Apr 15 22:52:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26017 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 6174BDE125 for ; Thu, 16 Apr 2009 08:53:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbZDOWxK (ORCPT ); Wed, 15 Apr 2009 18:53:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754498AbZDOWxI (ORCPT ); Wed, 15 Apr 2009 18:53:08 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:38634 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbZDOWxG (ORCPT ); Wed, 15 Apr 2009 18:53:06 -0400 Received: by bwz17 with SMTP id 17so114630bwz.37 for ; Wed, 15 Apr 2009 15:53:03 -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=lcdrCPF35jHhu6Zkt0FJS3gTTVTYbJDnCoj4M2B9Sso=; b=FI8kMV5piZxiikQAAabNC+iiwmTPsW21YrQ8qGyiSQRD5fddsmj1nf9DIDLtLerz0q l4SjP0RCfYe6GMATislz/yEYh5od0xB3e28szSnUWHwwm02xUi8XTkQeQi5fdlVBOluz HnlX53l+iMO9XZf9InkoJnkrujT6X+kunEEBk= 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=Q/mXeTimnOQmDqUUNyndu0fuvtePjsftIPMrETpNR4q1D7WfgR81FN0UmefG2a+Fz+ UgiYxpTPe90tPmlQ8OmoIO74MeULQkSYbZnU+H/QGdEbv1QNCd3PqDBEmcn1bQ9RgfVy tc840bjKNQTzUNaGerPjurBfFN/NRFR2z+kO8= Received: by 10.103.212.2 with SMTP id o2mr405193muq.131.1239835983655; Wed, 15 Apr 2009 15:53:03 -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.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:03 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 02/26] cpmac: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:36 +0400 Message-Id: <1239835980-22502-2-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-1-git-send-email-a.beregalov@gmail.com> References: <1239835980-22502-1-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/cpmac.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 3f476c7..af305c0 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c @@ -1093,6 +1093,19 @@ static int cpmac_stop(struct net_device *dev) return 0; } +static const struct net_device_ops cpmac_netdev_ops = { + .ndo_open = cpmac_open, + .ndo_stop = cpmac_stop, + .ndo_start_xmit = cpmac_start_xmit, + .ndo_tx_timeout = cpmac_tx_timeout, + .ndo_set_multicast_list = cpmac_set_multicast_list, + .ndo_so_ioctl = cpmac_ioctl, + .ndo_set_config = cpmac_config, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + static int external_switch; static int __devinit cpmac_probe(struct platform_device *pdev) @@ -1143,14 +1156,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev) dev->irq = platform_get_irq_byname(pdev, "irq"); - dev->open = cpmac_open; - dev->stop = cpmac_stop; - dev->set_config = cpmac_config; - dev->hard_start_xmit = cpmac_start_xmit; - dev->do_ioctl = cpmac_ioctl; - dev->set_multicast_list = cpmac_set_multicast_list; - dev->tx_timeout = cpmac_tx_timeout; - dev->ethtool_ops = &cpmac_ethtool_ops; + dev->netdev_ops = &cpmac_netdev_ops; + dev->ethtool_ops = &cpmac_ethtool_ops; netif_napi_add(dev, &priv->napi, cpmac_poll, 64);