From patchwork Sun Mar 29 15:30:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25287 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 12733DDDB6 for ; Mon, 30 Mar 2009 02:31:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758491AbZC2PaS (ORCPT ); Sun, 29 Mar 2009 11:30:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757775AbZC2PaR (ORCPT ); Sun, 29 Mar 2009 11:30:17 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:46729 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753160AbZC2PaO (ORCPT ); Sun, 29 Mar 2009 11:30:14 -0400 Received: by fxm2 with SMTP id 2so1633936fxm.37 for ; Sun, 29 Mar 2009 08:30:12 -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:mime-version:content-type:content-disposition:user-agent; bh=g0zZm47+LCK+WlanSOGhIACLqrWilRf6gahcq+mzLeg=; b=ZzGecJTbwCCOFz/iRtIh7dUH4fUqRJ1tgiYsBkA6bQuWeTb2dNzt6KMOR2ZM3Mfcj1 JT6dsfjaYAxOSsb0jtm4uyVEJFXYTPpqmZYRYGhCuWXwyy/QzBvutNiMIVPspM5Y8tT4 wdYxUKt7RhWMJoSU178/Pk5WDpG5adeVqYGkE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=J52c6DhjuNfc9k2wJrFVBVID3HPPKiFFqdKuNLkMbqcD/IDnaw9qDJTeFZBtYp8iag 5yFZesOCLqSXKEhVEjLb4ijlViVDs6ojKknO78RZ+Tp9leONzs7m2q52dVdSPIjwW0cI qRJEonXb3nPDaaArpg6Jv1kX9T0I477HzF5t8= Received: by 10.223.110.211 with SMTP id o19mr3160644fap.57.1238340612004; Sun, 29 Mar 2009 08:30:12 -0700 (PDT) Received: from orion (ppp91-76-231-215.pppoe.mtu-net.ru [91.76.231.215]) by mx.google.com with ESMTPS id p17sm1893610fka.10.2009.03.29.08.30.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 29 Mar 2009 08:30:11 -0700 (PDT) Date: Sun, 29 Mar 2009 19:30:08 +0400 From: Alexander Beregalov To: gregkh@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 8/10] Staging: slicoss: convert to netdev_ops Message-ID: <20090329153008.GH11056@orion> MIME-Version: 1.0 Content-Disposition: inline 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 Acked-by: David S. Miller --- drivers/staging/slicoss/slicoss.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 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/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 953684f..22343fc 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -345,6 +345,19 @@ static void slic_init_adapter(struct net_device *netdev, return; } +static const struct net_device_ops slic_netdev_ops = { + .ndo_open = slic_entry_open, + .ndo_stop = slic_entry_halt, + .ndo_start_xmit = slic_xmit_start, + .ndo_do_ioctl = slic_ioctl, + .ndo_set_mac_address = slic_mac_set_address, + .ndo_get_stats = slic_get_stats, + .ndo_set_multicast_list = slic_mcast_set_list, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, + .ndo_change_mtu = eth_change_mtu, +}; + static int __devinit slic_entry_probe(struct pci_dev *pcidev, const struct pci_device_id *pci_tbl_entry) { @@ -442,13 +455,7 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev, netdev->base_addr = (unsigned long)adapter->memorybase; netdev->irq = adapter->irq; - netdev->open = slic_entry_open; - netdev->stop = slic_entry_halt; - netdev->hard_start_xmit = slic_xmit_start; - netdev->do_ioctl = slic_ioctl; - netdev->set_mac_address = slic_mac_set_address; - netdev->get_stats = slic_get_stats; - netdev->set_multicast_list = slic_mcast_set_list; + netdev->netdev_ops = &slic_netdev_ops; slic_debug_adapter_create(adapter);