From patchwork Wed Apr 15 04:30:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25963 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 D8AB7DE152 for ; Wed, 15 Apr 2009 14:30:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbZDOEar (ORCPT ); Wed, 15 Apr 2009 00:30:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751089AbZDOEap (ORCPT ); Wed, 15 Apr 2009 00:30:45 -0400 Received: from fk-out-0910.google.com ([209.85.128.187]:25628 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbZDOEak (ORCPT ); Wed, 15 Apr 2009 00:30:40 -0400 Received: by fk-out-0910.google.com with SMTP id 18so1253680fkq.5 for ; Tue, 14 Apr 2009 21:30:39 -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=rnZuU6sbf2nVGOfxROxOx4/3qW9kadC1yv2L37lsEj8=; b=AZx0tfmhhfFXZTEK51V0sK9F9gaUrgInkb2UpjKT6etgof8PODXavUS2ldJwJhN6Zq zzd2Ngj9GaKp/i7hNOwh89DV0vrmG3qqGbwVhtpQ9AxLP5yK8MjEzRUIICA9EreoPxCI jf+rEI71018DUcHj917PneKRTQanaQr4NTOjA= 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=DcRkw5IdrQv32lbKDwghVdUhXoZkbP80f4uPVKVpKmoHHKEFi1Kq608D0tj89Cp/2y 6zCV6VsrWmhB0mkAYbkmpZWcWK6LiyX6ULbZr/pILfC3ZOxPl1kz8JBooDBIqZ2umgmz TeC6GnaU7TUHj+rEctOGRh84GNeAt+ljeXURw= Received: by 10.204.64.204 with SMTP id f12mr7648463bki.40.1239769838869; Tue, 14 Apr 2009 21:30:38 -0700 (PDT) Received: from localhost.localdomain ([91.78.157.235]) by mx.google.com with ESMTPS id 22sm7740798fkr.17.2009.04.14.21.30.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Apr 2009 21:30:38 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 5/5] declance: convert to net_device_ops Date: Wed, 15 Apr 2009 08:30:25 +0400 Message-Id: <1239769825-12413-5-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239769825-12413-4-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> <1239769825-12413-3-git-send-email-a.beregalov@gmail.com> <1239769825-12413-4-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/declance.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 861c867..b62405a 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -1010,6 +1010,17 @@ static void lance_set_multicast_retry(unsigned long _opaque) lance_set_multicast(dev); } +static const struct net_device_ops lance_netdev_ops = { + .ndo_open = lance_open, + .ndo_stop = lance_close, + .ndo_start_xmit = lance_start_xmit, + .ndo_tx_timeout = lance_tx_timeout, + .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, +}; + static int __init dec_lance_probe(struct device *bdev, const int type) { static unsigned version_printed; @@ -1223,12 +1234,8 @@ static int __init dec_lance_probe(struct device *bdev, const int type) printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq); - dev->open = &lance_open; - dev->stop = &lance_close; - dev->hard_start_xmit = &lance_start_xmit; - dev->tx_timeout = &lance_tx_timeout; + dev->netdev_ops = &lance_netdev_ops; dev->watchdog_timeo = 5*HZ; - dev->set_multicast_list = &lance_set_multicast; /* lp->ll is the location of the registers for lance card */ lp->ll = ll;