From patchwork Fri Nov 21 23:21:56 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 10151 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 2C9F9DDE20 for ; Sat, 22 Nov 2008 10:23:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755619AbYKUXXn (ORCPT ); Fri, 21 Nov 2008 18:23:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755066AbYKUXXj (ORCPT ); Fri, 21 Nov 2008 18:23:39 -0500 Received: from suva.vyatta.com ([76.74.103.44]:57065 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755298AbYKUXXf (ORCPT ); Fri, 21 Nov 2008 18:23:35 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id mALNNWum031506; Fri, 21 Nov 2008 15:23:32 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id mALNNWY1031505; Fri, 21 Nov 2008 15:23:32 -0800 Message-Id: <20081121232240.417398289@vyatta.com> References: <20081121232138.343333942@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 21 Nov 2008 15:21:56 -0800 From: Stephen Hemminger To: David Miller , Jeff Garzik Cc: netdev@vger.kernel.org Subject: [PATCH 18/22] hamachi: convert to net_device_ops Content-Disposition: inline; filename=hamachi.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert driver to new net_device_ops. Compile tested only. Signed-off-by: Stephen Hemminger --- a/drivers/net/hamachi.c 2008-11-21 14:34:32.000000000 -0800 +++ b/drivers/net/hamachi.c 2008-11-21 14:37:20.000000000 -0800 @@ -568,6 +568,19 @@ static void set_rx_mode(struct net_devic static const struct ethtool_ops ethtool_ops; static const struct ethtool_ops ethtool_ops_no_mii; +static const struct net_device_ops hamachi_netdev_ops = { + .ndo_open = hamachi_open, + .ndo_stop = hamachi_close, + .ndo_start_xmit = hamachi_start_xmit, + .ndo_get_stats = hamachi_get_stats, + .ndo_set_multicast_list = set_rx_mode, + .ndo_change_mtu = eth_change_mtu, + .ndo_validate_addr = eth_validate_addr, + .ndo_tx_timeout = hamachi_tx_timeout, + .ndo_do_ioctl = netdev_ioctl, +}; + + static int __devinit hamachi_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -722,17 +735,11 @@ static int __devinit hamachi_init_one (s /* The Hamachi-specific entries in the device structure. */ - dev->open = &hamachi_open; - dev->hard_start_xmit = &hamachi_start_xmit; - dev->stop = &hamachi_close; - dev->get_stats = &hamachi_get_stats; - dev->set_multicast_list = &set_rx_mode; - dev->do_ioctl = &netdev_ioctl; + dev->netdev_ops = &hamachi_netdev_ops; if (chip_tbl[hmp->chip_id].flags & CanHaveMII) SET_ETHTOOL_OPS(dev, ðtool_ops); else SET_ETHTOOL_OPS(dev, ðtool_ops_no_mii); - dev->tx_timeout = &hamachi_tx_timeout; dev->watchdog_timeo = TX_TIMEOUT; if (mtu) dev->mtu = mtu;