From patchwork Sat Mar 21 05:35:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24853 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 F3A73DDDB6 for ; Sat, 21 Mar 2009 16:54:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760878AbZCUFxL (ORCPT ); Sat, 21 Mar 2009 01:53:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754396AbZCUFxH (ORCPT ); Sat, 21 Mar 2009 01:53:07 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36574 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760880AbZCUFsP (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 n2L5m8XF027034; Fri, 20 Mar 2009 22:48:08 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5m86p027033; Fri, 20 Mar 2009 22:48:08 -0700 Message-Id: <20090321053713.012084771@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:33 -0700 From: Stephen Hemminger To: David Miller , samuel@sortiz.org Cc: netdev@vger.kernel.org Subject: [PATCH 06/77] irda: net_device_ops ioctl fix Content-Disposition: inline; filename=irda.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Need to reference net_device_ops not old pointer. Signed-off-by: Stephen Hemminger Acked-by: Samuel Ortiz Acked-by: Samuel Ortiz --- net/irda/irda_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/irda/irda_device.c 2009-03-19 22:40:30.469964248 -0700 +++ b/net/irda/irda_device.c 2009-03-19 22:42:44.867089916 -0700 @@ -149,13 +149,14 @@ int irda_device_is_receiving(struct net_ IRDA_DEBUG(2, "%s()\n", __func__); - if (!dev->do_ioctl) { + if (!dev->netdev_ops->ndo_do_ioctl) { IRDA_ERROR("%s: do_ioctl not impl. by device driver\n", __func__); return -1; } - ret = dev->do_ioctl(dev, (struct ifreq *) &req, SIOCGRECEIVING); + ret = (dev->netdev_ops->ndo_do_ioctl)(dev, (struct ifreq *) &req, + SIOCGRECEIVING); if (ret < 0) return ret;