From patchwork Sat Apr 11 17:44: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: 25864 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 0C902DE22A for ; Sun, 12 Apr 2009 03:45:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757681AbZDKRpF (ORCPT ); Sat, 11 Apr 2009 13:45:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758497AbZDKRpE (ORCPT ); Sat, 11 Apr 2009 13:45:04 -0400 Received: from yw-out-2324.google.com ([74.125.46.29]:20893 "EHLO yw-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758332AbZDKRpC (ORCPT ); Sat, 11 Apr 2009 13:45:02 -0400 Received: by yw-out-2324.google.com with SMTP id 5so1586973ywb.1 for ; Sat, 11 Apr 2009 10:45: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=veuHdRcUOY7ZaCOBszCYppXOEU/hAj9abKxW/xJN9GU=; b=JaNNFTLrU3Cvhgnewy6e7A2k6notfG3rosEGUwaDShJAFsHdgs6WKUPu51erQPa0h3 kNZKmXwMcrNPTlmtbNdxs16xuEZPVKhspq9WtnxGfK8LWhkvWMRM8TSFre3N4IWVvDoO MVgVEjZRkWeaPhkT+8POKc8pwJ5pTnkudyR7E= 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=nc6V4rDGX/StNVVh/wDBFAglb7jiU2x8hDbzR9tK2Oysk0H1/ZDR2ATaMKxn3Hl/fN GvwTekrDeq8KGjJjbZk3k2ImhiHbwEtwVLmJBJMJIvAmxsdec9zm7SsMsR2n58ot73er Tai/gCRMdQrloNlxI5jaYLy5PL/z74V+L1Afo= Received: by 10.100.106.12 with SMTP id e12mr899559anc.85.1239471901382; Sat, 11 Apr 2009 10:45:01 -0700 (PDT) Received: from orion ([91.78.156.47]) by mx.google.com with ESMTPS id d35sm9762610and.35.2009.04.11.10.44.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Apr 2009 10:45:00 -0700 (PDT) Date: Sat, 11 Apr 2009 21:44:55 +0400 From: Alexander Beregalov To: netdev@vger.kernel.org Subject: [PATCH 10/11] ioc3-eth: convert to net_device_ops Message-ID: <20090411174455.GJ16999@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/ioc3-eth.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 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/ioc3-eth.c b/drivers/net/ioc3-eth.c index cbc63ff..c5593f4 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c @@ -1214,6 +1214,19 @@ static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3) } #endif +static const struct net_device_ops ioc3_netdev_ops = { + .ndo_open = ioc3_open, + .ndo_stop = ioc3_close, + .ndo_start_xmit = ioc3_start_xmit, + .ndo_tx_timeout = ioc3_timeout, + .ndo_get_stats = ioc3_get_stats, + .ndo_set_multicast_list = ioc3_set_multicast_list, + .ndo_do_ioctl = ioc3_ioctl, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = ioc3_set_mac_address, + .ndo_change_mtu = eth_change_mtu, +}; + static int __devinit ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -1310,15 +1323,8 @@ static int __devinit ioc3_probe(struct pci_dev *pdev, ioc3_get_eaddr(ip); /* The IOC3-specific entries in the device structure. */ - dev->open = ioc3_open; - dev->hard_start_xmit = ioc3_start_xmit; - dev->tx_timeout = ioc3_timeout; dev->watchdog_timeo = 5 * HZ; - dev->stop = ioc3_close; - dev->get_stats = ioc3_get_stats; - dev->do_ioctl = ioc3_ioctl; - dev->set_multicast_list = ioc3_set_multicast_list; - dev->set_mac_address = ioc3_set_mac_address; + dev->netdev_ops = &ioc3_netdev_ops; dev->ethtool_ops = &ioc3_ethtool_ops; dev->features = NETIF_F_IP_CSUM;