From patchwork Sat Apr 11 17:41:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25860 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 3C9FADE0D2 for ; Sun, 12 Apr 2009 03:41:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757281AbZDKRlh (ORCPT ); Sat, 11 Apr 2009 13:41:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757246AbZDKRlg (ORCPT ); Sat, 11 Apr 2009 13:41:36 -0400 Received: from an-out-0708.google.com ([209.85.132.249]:6160 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756953AbZDKRlf (ORCPT ); Sat, 11 Apr 2009 13:41:35 -0400 Received: by an-out-0708.google.com with SMTP id d14so1350170and.1 for ; Sat, 11 Apr 2009 10:41:34 -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=oMHblc81aHdo9c9LIR47Iw693sr4bDi2hyBqItxklb4=; b=IvQ/cCoMyzykp86zPk6U6CxYhAOzQlciWK4Z1XIXiEYBz9octrmgVZCrrMywztril1 tAJrgp4GblWsI88t7x8tayGyx/YI+GLznv9tD9YlYozbTauO99Kp+Ndn1SalDTd+jScS AX2OKEGzreWYg0DsPywvTLmUnOktAlGquv2WY= 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=qtue8cFRLOmpWdmw6gGMtn7e1gi4NkScsHmZHvR2HXeOvwuzF+IgkDx8FNDBn9xL0v gWzsb2CPoySHOVsTgu8zbinOn+GIyxWzXcFEDceKrdRaS25aqxgX7/4rbX16UgY394Km FGpEDOQDHq2ahMPRIzrUoEJ2YhpoXLuq2hTQ4= Received: by 10.100.242.20 with SMTP id p20mr900135anh.119.1239471694165; Sat, 11 Apr 2009 10:41:34 -0700 (PDT) Received: from orion ([91.78.156.47]) by mx.google.com with ESMTPS id 6sm5284920ywc.53.2009.04.11.10.41.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Apr 2009 10:41:33 -0700 (PDT) Date: Sat, 11 Apr 2009 21:41:28 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: [PATCH 06/11] macsonic: convert to net_device_ops Message-ID: <20090411174128.GF16999@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/macsonic.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 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/macsonic.c b/drivers/net/macsonic.c index 527166e..acd143d 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c @@ -167,6 +167,18 @@ static int macsonic_close(struct net_device* dev) return err; } +static const struct net_device_ops macsonic_netdev_ops = { + .ndo_open = macsonic_open, + .ndo_stop = macsonic_close, + .ndo_start_xmit = sonic_send_packet, + .ndo_set_multicast_list = sonic_multicast_list, + .ndo_tx_timeout = sonic_tx_timeout, + .ndo_get_stats = sonic_get_stats, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +}; + static int __init macsonic_init(struct net_device *dev) { struct sonic_local* lp = netdev_priv(dev); @@ -198,12 +210,7 @@ static int __init macsonic_init(struct net_device *dev) lp->rra_laddr = lp->rda_laddr + (SIZEOF_SONIC_RD * SONIC_NUM_RDS * SONIC_BUS_SCALE(lp->dma_bitmode)); - dev->open = macsonic_open; - dev->stop = macsonic_close; - dev->hard_start_xmit = sonic_send_packet; - dev->get_stats = sonic_get_stats; - dev->set_multicast_list = &sonic_multicast_list; - dev->tx_timeout = sonic_tx_timeout; + dev->netdev_ops = &macsonic_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; /*