From patchwork Sat Apr 11 17:42:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25861 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 CB0ADDE257 for ; Sun, 12 Apr 2009 03:42:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757252AbZDKRmf (ORCPT ); Sat, 11 Apr 2009 13:42:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751562AbZDKRme (ORCPT ); Sat, 11 Apr 2009 13:42:34 -0400 Received: from an-out-0708.google.com ([209.85.132.251]:50886 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751387AbZDKRmd (ORCPT ); Sat, 11 Apr 2009 13:42:33 -0400 Received: by an-out-0708.google.com with SMTP id d14so1350385and.1 for ; Sat, 11 Apr 2009 10:42:32 -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=Xo1r2Rj2yBK7eKAZ+wrHooBUK35IMDHC2q1i5g4Ugaw=; b=rco+95MHdKhoGwZEpOQqpNJy71TpsjhaZm+uu497d+0XxdKlOzkdzLZ1RVieJiuPuA bJ7dVWi/ayOhogneE+nv1q75FRQ6ZarXCCa9StN+JqTrn4sTUIilt2ls1hC0U0PF4UCO X2yV6gl7zCFW1RtP6S68kOhnk8uMkXyjenu+Q= 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=KN9nau9vDZf0NKuRsriZGf+W9jADteWWWh/YdNJTQjuua1xnfPVuNVs8rVfUzf375l NGu/hT2uu5QyJraWSltOEpMqDugMvvtLvw7Kx9MSUDtSsOdrWnYrDuVlE8fmtdI7JMG1 wkBgzMZuI+4p8gx0l0z0GFlV+ckufTdT5nsiM= Received: by 10.100.7.13 with SMTP id 13mr4779376ang.10.1239471751998; Sat, 11 Apr 2009 10:42:31 -0700 (PDT) Received: from orion (ppp91-78-156-47.pppoe.mtu-net.ru [91.78.156.47]) by mx.google.com with ESMTPS id d29sm9808132and.14.2009.04.11.10.42.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Apr 2009 10:42:31 -0700 (PDT) Date: Sat, 11 Apr 2009 21:42:26 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: [PATCH 07/11] macb: convert to net_device_ops Message-ID: <20090411174226.GG16999@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/macb.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/macb.c b/drivers/net/macb.c index f505010..46073de 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1100,6 +1100,18 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return phy_mii_ioctl(phydev, if_mii(rq), cmd); } +static const struct net_device_ops macb_netdev_ops = { + .ndo_open = macb_open, + .ndo_stop = macb_close, + .ndo_start_xmit = macb_start_xmit, + .ndo_set_multicast_list = macb_set_rx_mode, + .ndo_get_stats = macb_get_stats, + .ndo_do_ioctl = macb_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +}; + static int __init macb_probe(struct platform_device *pdev) { struct eth_platform_data *pdata; @@ -1175,12 +1187,7 @@ static int __init macb_probe(struct platform_device *pdev) goto err_out_iounmap; } - dev->open = macb_open; - dev->stop = macb_close; - dev->hard_start_xmit = macb_start_xmit; - dev->get_stats = macb_get_stats; - dev->set_multicast_list = macb_set_rx_mode; - dev->do_ioctl = macb_ioctl; + dev->netdev_ops = &macb_netdev_ops; netif_napi_add(dev, &bp->napi, macb_poll, 64); dev->ethtool_ops = &macb_ethtool_ops;