From patchwork Wed Apr 15 22:52:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26016 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 D03FADE115 for ; Thu, 16 Apr 2009 08:53:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753642AbZDOWxH (ORCPT ); Wed, 15 Apr 2009 18:53:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753524AbZDOWxG (ORCPT ); Wed, 15 Apr 2009 18:53:06 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:48714 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbZDOWxF (ORCPT ); Wed, 15 Apr 2009 18:53:05 -0400 Received: by fxm2 with SMTP id 2so121386fxm.37 for ; Wed, 15 Apr 2009 15:53:02 -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; bh=Ox3dpqVMTPGuVukHST0Tm0i4cr8GuPedBC5aeGx76QE=; b=SCiyC0b0Ag2Os1ikraHVUAfkwyw6dlEsaUWT/GZWsUMK1Oejsi+wi6ekpLE1pBtpz8 HmsBlULYpCKacY3UVrUpOgv5NWpw9Y37TOygSHJIhnxS0bW5BTt5kZkaaDdF5KNDFBCk HivKR8WYFYgg+J7ZCkNG3yeypgqzDqnHs955g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=lqp3sL//KeCIRz8BbpXQEsj7QScA0BhUGNP/41yb/ItyPV/HSXEJjYjh2SMx8Bvz+S ECvBfsueNWOyJECQxQ4otAzoBC+D7GEWppoCLSWzfRhoh2YkcGfXcN7Ie3agmKW/kr0E vCLudV4ajVSMVsSRoYF4L02nRiWe52cSRXBUc= Received: by 10.103.175.8 with SMTP id c8mr407927mup.117.1239835982557; Wed, 15 Apr 2009 15:53:02 -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.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:02 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 01/26] bmac: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:35 +0400 Message-Id: <1239835980-22502-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/bmac.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 44d015f..9578a3d 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c @@ -1247,6 +1247,16 @@ static const struct ethtool_ops bmac_ethtool_ops = { .get_link = ethtool_op_get_link, }; +static const struct net_device_ops bmac_netdev_ops = { + .ndo_open = bmac_open, + .ndo_stop = bmac_close, + .ndo_start_xmit = bmac_output, + .ndo_set_multicast_list = bmac_set_multicast, + .ndo_set_mac_address = bmac_set_address, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, +}; + static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_id *match) { int j, rev, ret; @@ -1308,12 +1318,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i bmac_enable_and_reset_chip(dev); bmwrite(dev, INTDISABLE, DisableAll); - dev->open = bmac_open; - dev->stop = bmac_close; + dev->netdev_ops = &bmac_netdev_ops; dev->ethtool_ops = &bmac_ethtool_ops; - dev->hard_start_xmit = bmac_output; - dev->set_multicast_list = bmac_set_multicast; - dev->set_mac_address = bmac_set_address; bmac_get_station_address(dev, addr); if (bmac_verify_checksum(dev) != 0)