From patchwork Wed Apr 15 22:52:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26030 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 923E8DE219 for ; Thu, 16 Apr 2009 08:54:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756764AbZDOWxn (ORCPT ); Wed, 15 Apr 2009 18:53:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756729AbZDOWxj (ORCPT ); Wed, 15 Apr 2009 18:53:39 -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 S1756546AbZDOWx1 (ORCPT ); Wed, 15 Apr 2009 18:53:27 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114630bwz.37 for ; Wed, 15 Apr 2009 15:53:26 -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=NgfwtDlcuX01qr0fFTtAJ3RBfU9AoY33N7gXqYzW8Iw=; b=qXzWMiy/MD61Kv//qbM7IPZNi0QyfI0aKTxotNYacsa4bm4Q6/tnPU2UHGYZ33P5N1 h5f4MRYwrONOZ+WslIVU8TLbnOuiXmpQtn/9MPPMgIVllclKxVbiuAsb5ha8p6WfZ1VC pZ14B57Zd12ksIqLX79CrVz6LdpersxzS36X8= 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=vW3jw3xebOY24jYBaKUPPQVT+Nsay2nvft1MtmGYJGIYAbxzSxo2wb33e/2x4yz6MT 61daPMuQq3QG+3OMp1S364Hp40U95wFlPKFuJQ+0n2cd09nSMVrXUDwN5/3bWpcyTxFq Cz2CKjC5PJg+eRs5tguofQt5cBnSKAvY8j6eE= Received: by 10.103.105.1 with SMTP id h1mr430165mum.13.1239836006623; Wed, 15 Apr 2009 15:53:26 -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.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:26 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 19/26] netx-eth: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:53 +0400 Message-Id: <1239835980-22502-19-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-18-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/netx-eth.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index 1861d5b..946366d 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c @@ -301,6 +301,17 @@ netx_eth_phy_write(struct net_device *ndev, int phy_id, int reg, int value) while (readl(NETX_MIIMU) & MIIMU_SNRDY); } +static const struct net_device_ops netx_eth_netdev_ops = { + .ndo_open = netx_eth_open, + .ndo_stop = netx_eth_close, + .ndo_start_xmit = netx_eth_hard_start_xmit, + .ndo_tx_timeout = netx_eth_timeout, + .ndo_set_multicast_list = netx_eth_set_multicast_list, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + static int netx_eth_enable(struct net_device *ndev) { struct netx_eth_priv *priv = netdev_priv(ndev); @@ -309,12 +320,8 @@ static int netx_eth_enable(struct net_device *ndev) ether_setup(ndev); - ndev->open = netx_eth_open; - ndev->stop = netx_eth_close; - ndev->hard_start_xmit = netx_eth_hard_start_xmit; - ndev->tx_timeout = netx_eth_timeout; + ndev->netdev_ops = &netx_eth_netdev_ops; ndev->watchdog_timeo = msecs_to_jiffies(5000); - ndev->set_multicast_list = netx_eth_set_multicast_list; priv->msg_enable = NETIF_MSG_LINK; priv->mii.phy_id_mask = 0x1f;