From patchwork Sat Apr 11 17:45:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25865 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 772FBDE20F for ; Sun, 12 Apr 2009 03:46:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757642AbZDKRqH (ORCPT ); Sat, 11 Apr 2009 13:46:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757719AbZDKRqE (ORCPT ); Sat, 11 Apr 2009 13:46:04 -0400 Received: from yw-out-2324.google.com ([74.125.46.30]:20446 "EHLO yw-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562AbZDKRqC (ORCPT ); Sat, 11 Apr 2009 13:46:02 -0400 Received: by yw-out-2324.google.com with SMTP id 5so1587258ywb.1 for ; Sat, 11 Apr 2009 10:46:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=04Qyi89k0uS/KVUEriwSfCUZiye5Sj8b2izD+xAXhhw=; b=fv4krRwSzNFZ3Ez1GeoDIobfkiftwVvqtBC2lqJSBWPW2M6d1K0x1pgybMrtftSwEa ncILRtvw6J4n4d9pJdKmPozlNfCm1rzWgdRGHMKBoxL7EQl8hFnznQH21fOc8XLlOyGu uVMSeXFP5cNJOhxdzuq7cOnEJH60mgll50XvM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=eTgaIB/XdRoepFbUXQtfPhtfdUqeAclrcGQhfCdVKU/UQQAH8ZIDa1gFKq0Y9AYlfr F3vMbZVp19LsRoZEbA7QTy2GohJBsf8CEXG5KWoLDSRg59oHFa9yrsENoMmsi0tm24b6 Ea5lOwSZvml+Q9A3POjSIMk5LLV/4wU13t8Ic= Received: by 10.100.8.17 with SMTP id 17mr4462425anh.108.1239471961118; Sat, 11 Apr 2009 10:46:01 -0700 (PDT) Received: from orion ([91.78.156.47]) by mx.google.com with ESMTPS id c14sm9657911ana.1.2009.04.11.10.45.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Apr 2009 10:46:00 -0700 (PDT) Date: Sat, 11 Apr 2009 21:45:55 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: [PATCH 11/11] eth_v10: convert to net_device_ops Message-ID: <20090411174555.GK16999@orion> References: <20090411173019.GA16999@orion> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090411173019.GA16999@orion> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/cris/eth_v10.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index c9806c5..7a18dc7 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c @@ -257,6 +257,23 @@ struct transceiver_ops transceivers[] = struct transceiver_ops* transceiver = &transceivers[0]; +static const struct net_device_ops e100_netdev_ops = { + .ndo_open = e100_open, + .ndo_stop = e100_close, + .ndo_start_xmit = e100_send_packet, + .ndo_tx_timeout = e100_tx_timeout, + .ndo_get_stats = e100_get_stats, + .ndo_set_multicast_list = set_multicast_list, + .ndo_do_ioctl = e100_ioctl, + .ndo_set_mac_address = e100_set_mac_address, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_config = e100_set_config, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = e100_netpoll, +#endif +}; + #define tx_done(dev) (*R_DMA_CH0_CMD == 0) /* @@ -300,19 +317,8 @@ etrax_ethernet_init(void) /* fill in our handlers so the network layer can talk to us in the future */ - dev->open = e100_open; - dev->hard_start_xmit = e100_send_packet; - dev->stop = e100_close; - dev->get_stats = e100_get_stats; - dev->set_multicast_list = set_multicast_list; - dev->set_mac_address = e100_set_mac_address; dev->ethtool_ops = &e100_ethtool_ops; - dev->do_ioctl = e100_ioctl; - dev->set_config = e100_set_config; - dev->tx_timeout = e100_tx_timeout; -#ifdef CONFIG_NET_POLL_CONTROLLER - dev->poll_controller = e100_netpoll; -#endif + dev->netdev_ops = &e100_netdev_ops; spin_lock_init(&np->lock); spin_lock_init(&np->led_lock);