From patchwork Wed Apr 15 22:52:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26019 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 A3D20DE204 for ; Thu, 16 Apr 2009 08:53:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755158AbZDOWxQ (ORCPT ); Wed, 15 Apr 2009 18:53:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755184AbZDOWxO (ORCPT ); Wed, 15 Apr 2009 18:53:14 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:50591 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753740AbZDOWxI (ORCPT ); Wed, 15 Apr 2009 18:53:08 -0400 Received: by bwz17 with SMTP id 17so114640bwz.37 for ; Wed, 15 Apr 2009 15:53:06 -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=B0XuQVq4SY2kAXkNfbhAv6hWhKb12iKY+CkWhbjvWd4=; b=hRCfhD5AGHrNKlv2vswY8h73gzuT8vn8YNI0fWQns0vCEcAA6zHvi77Q926sUO68ec /N1J8cwC34DGHvVWnr6rmvVLmiwxW+z2d50rbtNuTV0RV4QsmW5rdt1tQEKIp7OM+Wxk pj8BQMrStU6GdN8ckv8D3h9APAwidQku35Ork= 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=Tql5Yv1K6CKFHvryd0VUsIGDzCpJl+yrrhG7+vlgfsH5y9omVNm46c7VbSp9f5jcH/ Wdfs146qGkuypvlBxoCHOtVg5ShCWG8nRtwmYhPNNL/MNaSXOGAv5+klfUQoIqO8MeVk xdYePrtDUZoGBdhIweMZ/MY6Sn5vddxVtVgeM= Received: by 10.103.193.12 with SMTP id v12mr428957mup.23.1239835986446; Wed, 15 Apr 2009 15:53:06 -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.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:05 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 04/26] hplance: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:38 +0400 Message-Id: <1239835980-22502-4-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-3-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/hplance.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 2e80263..3e3528a 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c @@ -71,6 +71,19 @@ static struct dio_driver hplance_driver = { .remove = __devexit_p(hplance_remove_one), }; +static const struct net_device_ops hplance_netdev_ops = { + .ndo_open = hplance_open, + .ndo_stop = hplance_close, + .ndo_start_xmit = lance_start_xmit, + .ndo_set_multicast_list = lance_set_multicast, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = lance_poll, +#endif +}; + /* Find all the HP Lance boards and initialise them... */ static int __devinit hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent) @@ -135,13 +148,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) /* Fill the dev fields */ dev->base_addr = va; - dev->open = &hplance_open; - dev->stop = &hplance_close; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = lance_poll; -#endif - dev->hard_start_xmit = &lance_start_xmit; - dev->set_multicast_list = &lance_set_multicast; + dev->netdev_ops = &hplance_netdev_ops; dev->dma = 0; for (i=0; i<6; i++) {