From patchwork Fri Nov 21 23:21:59 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 10155 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 157A8DDE21 for ; Sat, 22 Nov 2008 10:23:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755812AbYKUXXt (ORCPT ); Fri, 21 Nov 2008 18:23:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755472AbYKUXXs (ORCPT ); Fri, 21 Nov 2008 18:23:48 -0500 Received: from suva.vyatta.com ([76.74.103.44]:57077 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755378AbYKUXXi (ORCPT ); Fri, 21 Nov 2008 18:23:38 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id mALNNZEq031539; Fri, 21 Nov 2008 15:23:35 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id mALNNYAs031538; Fri, 21 Nov 2008 15:23:34 -0800 Message-Id: <20081121232240.672345637@vyatta.com> References: <20081121232138.343333942@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 21 Nov 2008 15:21:59 -0800 From: Stephen Hemminger To: David Miller , Jeff Garzik Cc: netdev@vger.kernel.org Subject: [PATCH 21/22] eql: convert to net_device_ops Content-Disposition: inline; filename=egl-netdev_ops.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/eql.c 2008-11-21 14:57:44.000000000 -0800 +++ b/drivers/net/eql.c 2008-11-21 14:59:55.000000000 -0800 @@ -162,6 +162,13 @@ static void eql_timer(unsigned long para static char version[] __initdata = "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n"; +static const struct net_device_ops eql_netdev_ops = { + .ndo_open = eql_open, + .ndo_stop = eql_close, + .ndo_do_ioctl = eql_ioctl, + .ndo_start_xmit = eql_slave_xmit, +}; + static void __init eql_setup(struct net_device *dev) { equalizer_t *eql = netdev_priv(dev); @@ -175,10 +182,7 @@ static void __init eql_setup(struct net_ INIT_LIST_HEAD(&eql->queue.all_slaves); eql->queue.master_dev = dev; - dev->open = eql_open; - dev->stop = eql_close; - dev->do_ioctl = eql_ioctl; - dev->hard_start_xmit = eql_slave_xmit; + dev->netdev_ops = &eql_netdev_ops; /* * Now we undo some of the things that eth_setup does