From patchwork Wed Apr 15 22:52:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26028 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 4D107DE219 for ; Thu, 16 Apr 2009 08:54:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756743AbZDOWxj (ORCPT ); Wed, 15 Apr 2009 18:53:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756365AbZDOWxf (ORCPT ); Wed, 15 Apr 2009 18:53:35 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:58032 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755966AbZDOWxW (ORCPT ); Wed, 15 Apr 2009 18:53:22 -0400 Received: by fxm2 with SMTP id 2so121450fxm.37 for ; Wed, 15 Apr 2009 15:53:20 -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=MV7ccJcvxZ/aO9MLiPsF4UPVoaToi2B/jGq8XCKtWfU=; b=pg58Jws9i+m0xzDsjfMAl6NOWc07DPiwJJTNW5KKWiK4wfA4yMyLyVOLHi8n6ybc8g 429+ysuhw/1g9JRqJrh3ri0PHe8Ip1L5jySGlgnwzgMONoYlTy+kGU5svEohJwDfJrcb oefw+7nFjn7Hdt1xtScWCIKDfzUvxtdqNNLgs= 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=qI8VfsXwBhoPj+nf5bCWq55FL1E4DCHKUAoer6/X3KqZsJ/YBf4eQgzfmtVk7U8wBw 9R29CLJhJ5ozCadiRcSXMYdE3YcmShTgETRwZvNFgdsydZb75gkQvRYtq6K/I6clNpr7 bhzg/csoBdlXqVx1R7TNuOQtzYJX6/heN+6rU= Received: by 10.103.218.9 with SMTP id v9mr416011muq.78.1239836000884; Wed, 15 Apr 2009 15:53:20 -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.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:20 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 14/26] mace: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:48 +0400 Message-Id: <1239835980-22502-14-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-13-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/mace.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/net/mace.c b/drivers/net/mace.c index feebbd9..1ad740b 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c @@ -94,6 +94,16 @@ static void __mace_set_address(struct net_device *dev, void *addr); */ static unsigned char *dummy_buf; +static const struct net_device_ops mace_netdev_ops = { + .ndo_open = mace_open, + .ndo_stop = mace_close, + .ndo_start_xmit = mace_xmit_start, + .ndo_set_multicast_list = mace_set_multicast, + .ndo_set_mac_address = mace_set_address, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, +}; + static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_id *match) { struct device_node *mace = macio_get_of_node(mdev); @@ -207,11 +217,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i } } - dev->open = mace_open; - dev->stop = mace_close; - dev->hard_start_xmit = mace_xmit_start; - dev->set_multicast_list = mace_set_multicast; - dev->set_mac_address = mace_set_address; + dev->netdev_ops = &mace_netdev_ops; /* * Most of what is below could be moved to mace_open()