From patchwork Wed Apr 15 22:52:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26025 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 E0F12DE20B for ; Thu, 16 Apr 2009 08:53:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756705AbZDOWxa (ORCPT ); Wed, 15 Apr 2009 18:53:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752315AbZDOWx2 (ORCPT ); Wed, 15 Apr 2009 18:53:28 -0400 Received: from mail-bw0-f169.google.com ([209.85.218.169]:38634 "EHLO mail-bw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755496AbZDOWxQ (ORCPT ); Wed, 15 Apr 2009 18:53:16 -0400 Received: by mail-bw0-f169.google.com with SMTP id 17so114630bwz.37 for ; Wed, 15 Apr 2009 15:53:15 -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=Z0iismK388YNHDVv5EA1zT4XM2IHZx2UJp9inbjFODM=; b=lA2+Q7Vc+yEOnvJd9gIUrDQWv06oizKo9rS+IjXKPQfTokirJ8MXttDBGlbBej7nJY mVBtfLJrOgsYowcKrDEmsjEN1IRmgEUsBf4DIxomKHxD3+FvKoUi3beUXvAEGN1mD7lu i9J2S14hiyCc0p544LRtgo/BU3gCymzsR9LCw= 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=hdsEQfL0crSzmmiBZyN9BuokK5rT9Y+wtxsCEki99+lnlHB+pk55zs0W3nlKjVmW2W coc+ZOIYRI6+wIcSmUxK9+ZJRSGFC/+Nt4aAFHO9HEm6YeeeraYajgIe3TJCYyxERj1n corSPCJCZMWUrLpFigGCkt3d5rqrVRTZAgFBQ= Received: by 10.103.223.2 with SMTP id a2mr431608mur.4.1239835995099; Wed, 15 Apr 2009 15:53:15 -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.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:14 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 10/26] ixp2000/ixpdev: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:44 +0400 Message-Id: <1239835980-22502-10-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-9-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/ixp2000/ixpdev.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index d3bf2f0..2a0174b 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c @@ -270,6 +270,18 @@ static int ixpdev_close(struct net_device *dev) return 0; } +static const struct net_device_ops ixpdev_netdev_ops = { + .ndo_open = ixpdev_open, + .ndo_stop = ixpdev_close, + .ndo_start_xmit = ixpdev_xmit, + .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 = ixpdev_poll_controller, +#endif +}; + struct net_device *ixpdev_alloc(int channel, int sizeof_priv) { struct net_device *dev; @@ -279,12 +291,7 @@ struct net_device *ixpdev_alloc(int channel, int sizeof_priv) if (dev == NULL) return NULL; - dev->hard_start_xmit = ixpdev_xmit; - dev->open = ixpdev_open; - dev->stop = ixpdev_close; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = ixpdev_poll_controller; -#endif + dev->netdev_ops = &ixpdev_netdev_ops; dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;