From patchwork Wed Apr 15 04:30:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25962 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 4B4B6DE14E for ; Wed, 15 Apr 2009 14:30:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751082AbZDOEao (ORCPT ); Wed, 15 Apr 2009 00:30:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751307AbZDOEao (ORCPT ); Wed, 15 Apr 2009 00:30:44 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:53338 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751082AbZDOEaj (ORCPT ); Wed, 15 Apr 2009 00:30:39 -0400 Received: by bwz17 with SMTP id 17so2712604bwz.37 for ; Tue, 14 Apr 2009 21:30:36 -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=AOYP8V0/aQNPMBFa55nK0Hu7JYpHig/S5ymSCjoyBfM=; b=ZcQ4zqi9cj1TAIJtLhbz79OK2zJ5sgHC9HBFZ8uy1lmG/gD9Tc7uYPjKXyE25gGbpY LBJEsb5rKWH3n5DRjrEB5B4izK61Ae0H0+JgLUIy+tw5dEgOqWPxvwb/THIkSUg7gLBY JLFYHcnaypnZWQA3DELB8nP1Dd/euNhQW6QRc= 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=HNKdolMsmt0TACGSG+3+Ay9u6/a2/5GHHfcKQ5x6o+cFGza5pAVtw3KvfCRfVqPViC FN4A+wjYSFCQZklMwaE0pBIWnA6AkkbUyxui0l06d1S6q3iHrK5SNZxZu02drsDv5+nM 0nJ3U1PLnMRKqy5JcSY3CFc4W15YYmzWVTnaU= Received: by 10.204.76.129 with SMTP id c1mr219393bkk.9.1239769836853; Tue, 14 Apr 2009 21:30:36 -0700 (PDT) Received: from localhost.localdomain ([91.78.157.235]) by mx.google.com with ESMTPS id 22sm7740798fkr.17.2009.04.14.21.30.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Apr 2009 21:30:36 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 3/5] au1000: convert to net_device_ops Date: Wed, 15 Apr 2009 08:30:23 +0400 Message-Id: <1239769825-12413-3-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239769825-12413-2-git-send-email-a.beregalov@gmail.com> References: <1239769825-12413-1-git-send-email-a.beregalov@gmail.com> <1239769825-12413-2-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/au1000_eth.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 4274e4a..d58c105 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c @@ -1004,12 +1004,12 @@ static void au1000_tx_timeout(struct net_device *dev) netif_wake_queue(dev); } -static void set_rx_mode(struct net_device *dev) +static void au1000_multicast_list(struct net_device *dev) { struct au1000_private *aup = netdev_priv(dev); if (au1000_debug > 4) - printk("%s: set_rx_mode: flags=%x\n", dev->name, dev->flags); + printk("%s: au1000_multicast_list: flags=%x\n", dev->name, dev->flags); if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ aup->mac->control |= MAC_PROMISCUOUS; @@ -1047,6 +1047,18 @@ static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return phy_mii_ioctl(aup->phy_dev, if_mii(rq), cmd); } +static const struct net_device_ops au1000_netdev_ops = { + .ndo_open = au1000_open, + .ndo_stop = au1000_close, + .ndo_start_xmit = au1000_tx, + .ndo_set_multicast_list = au1000_multicast_list, + .ndo_do_ioctl = au1000_ioctl, + .ndo_tx_timeout = au1000_tx_timeout, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, +}; + static struct net_device * au1000_probe(int port_num) { static unsigned version_printed = 0; @@ -1197,13 +1209,8 @@ static struct net_device * au1000_probe(int port_num) dev->base_addr = base; dev->irq = irq; - dev->open = au1000_open; - dev->hard_start_xmit = au1000_tx; - dev->stop = au1000_close; - dev->set_multicast_list = &set_rx_mode; - dev->do_ioctl = &au1000_ioctl; + dev->netdev_ops = &au1000_netdev_ops; SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops); - dev->tx_timeout = au1000_tx_timeout; dev->watchdog_timeo = ETH_TX_TIMEOUT; /*