From patchwork Wed Apr 15 22:52:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26036 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 D245BDE201 for ; Thu, 16 Apr 2009 08:54:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756813AbZDOWx7 (ORCPT ); Wed, 15 Apr 2009 18:53:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756716AbZDOWxz (ORCPT ); Wed, 15 Apr 2009 18:53:55 -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 S1756630AbZDOWxa (ORCPT ); Wed, 15 Apr 2009 18:53:30 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114630bwz.37 for ; Wed, 15 Apr 2009 15:53:30 -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=6ykdkLFv+nF2K2Us9nWWLBGA8Ppt6r21KiY9Gjeft3E=; b=hkjaGt+DJHiJNN9Ho6/xdynq7nDjct+xC0UiFC93/jVNUr63VrF9UPlINRjl3KF4RT UThj6Qp2uSWPm0sMmO/z2IIcencQiBTSczU+j4qKoS4na0A7EfrwwLAfizSAbNkzV5O/ FQxoXKBzeQMaToCaaNHHVFj6OP/XxbzoQH9sU= 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=otdvUAsaEkDLqW9E7t8L7pk8aSJTvNrb2Z6lfwndRicErjkbYChhFk1/RL1V/PxP4L O+qekKjF6mNfvXQp7incVt9r3X7UDbx2PbSNgYNifnAHN8A8ftVPBYY4NU0T71KD1xy8 2Jq42Ku6Bbj/qEMj+lmdQmXCo9Tqkgy7T27cE= Received: by 10.103.91.2 with SMTP id t2mr420722mul.52.1239836009842; Wed, 15 Apr 2009 15:53:29 -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.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:29 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 22/26] rionet: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:56 +0400 Message-Id: <1239835980-22502-22-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-21-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> <1239835980-22502-21-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/rionet.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index ec59e29..8702e7a 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c @@ -428,6 +428,15 @@ static const struct ethtool_ops rionet_ethtool_ops = { .get_link = ethtool_op_get_link, }; +static const struct net_device_ops rionet_netdev_ops = { + .ndo_open = rionet_open, + .ndo_stop = rionet_close, + .ndo_start_xmit = rionet_start_xmit, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +}; + static int rionet_setup_netdev(struct rio_mport *mport) { int rc = 0; @@ -466,10 +475,7 @@ static int rionet_setup_netdev(struct rio_mport *mport) ndev->dev_addr[4] = device_id >> 8; ndev->dev_addr[5] = device_id & 0xff; - /* Fill in the driver function table */ - ndev->open = &rionet_open; - ndev->hard_start_xmit = &rionet_start_xmit; - ndev->stop = &rionet_close; + ndev->netdev_ops = &rionet_netdev_ops; ndev->mtu = RIO_MAX_MSG_SIZE - 14; ndev->features = NETIF_F_LLTX; SET_ETHTOOL_OPS(ndev, &rionet_ethtool_ops);