From patchwork Sat Mar 21 05:35:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24859 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 8E467DDDB6 for ; Sat, 21 Mar 2009 16:54:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760346AbZCUFxZ (ORCPT ); Sat, 21 Mar 2009 01:53:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762183AbZCUFxX (ORCPT ); Sat, 21 Mar 2009 01:53:23 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36561 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760799AbZCUFsP (ORCPT ); Sat, 21 Mar 2009 01:48:15 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2L5mAKr027078; Fri, 20 Mar 2009 22:48:11 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5mA0P027077; Fri, 20 Mar 2009 22:48:10 -0700 Message-Id: <20090321053713.827044480@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:44 -0700 From: Stephen Hemminger To: David Miller , samuel@sortiz.org Cc: netdev@vger.kernel.org Subject: [PATCH 17/77] irda: convert sir device to net_device_ops Content-Disposition: inline; filename=irda-sir.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger Acked-by: Samuel Ortiz --- a/drivers/net/irda/sir_dev.c 2009-03-19 22:52:52.826089334 -0700 +++ b/drivers/net/irda/sir_dev.c 2009-03-19 23:09:32.268774083 -0700 @@ -865,6 +865,12 @@ out: return 0; } +static const struct net_device_ops sirdev_ops = { + .ndo_start_xmit = sirdev_hard_xmit, + .ndo_open = sirdev_open, + .ndo_stop = sirdev_close, + .ndo_do_ioctl = sirdev_ioctl, +}; /* ----------------------------------------------------------------------------- */ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *name) @@ -908,10 +914,7 @@ struct sir_dev * sirdev_get_instance(con dev->netdev = ndev; /* Override the network functions we need to use */ - ndev->hard_start_xmit = sirdev_hard_xmit; - ndev->open = sirdev_open; - ndev->stop = sirdev_close; - ndev->do_ioctl = sirdev_ioctl; + ndev->netdev_ops = &sirdev_ops; if (register_netdev(ndev)) { IRDA_ERROR("%s(), register_netdev() failed!\n", __func__);