From patchwork Sat Jun 12 21:10:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 55399 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.180.67]) by ozlabs.org (Postfix) with ESMTP id A2ED7B7D87 for ; Sun, 13 Jun 2010 07:14:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463Ab0FLVKm (ORCPT ); Sat, 12 Jun 2010 17:10:42 -0400 Received: from mail.perches.com ([173.55.12.10]:1093 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752343Ab0FLVKl (ORCPT ); Sat, 12 Jun 2010 17:10:41 -0400 Received: from [192.168.1.151] (new-host-9.home [192.168.1.151]) by mail.perches.com (Postfix) with ESMTP id 2CD9024368; Sat, 12 Jun 2010 14:10:38 -0700 (PDT) Subject: Re: Broken rndis_host with #define DEBUG (by a475f603d23392f386e45cf377b17c30ed3bbb80) From: Joe Perches To: Jussi Kivilinna Cc: "David S.Miller" , netdev@vger.kernel.org, David Brownell In-Reply-To: <20100612233907.2036688tfjxqq9hc@hayate.sektori.org> References: <20100612233907.2036688tfjxqq9hc@hayate.sektori.org> Date: Sat, 12 Jun 2010 14:10:38 -0700 Message-ID: <1276377038.21640.67.camel@Joe-Laptop.home> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, 2010-06-12 at 23:39 +0300, Jussi Kivilinna wrote: > Commit a475f603d23392f386e45cf377b17c30ed3bbb80 "drivers/net/usb: Use > netif_ logging facilities" causes problems with rndis_host. > > rndis_host oopses with #define DEBUG, in generic_rndis_bind() when > calling netif_dbg(). Problem is that (netdev)->dev.parent is NULL > (used in netdev_printk) while generic_rndis_bind is called. Thanks. Here's a revert until these macros get converted to functions. Signed-off-by: Joe Perches --- drivers/net/usb/rndis_host.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 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/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 28d3ee1..49c3044 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -342,8 +342,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1); if (dev->maxpacket == 0) { - netif_dbg(dev, probe, dev->net, - "dev->maxpacket can't be 0\n"); + if (netif_msg_probe(dev)) + dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n"); retval = -EINVAL; goto fail_and_release; } @@ -401,15 +401,17 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) } if ((flags & FLAG_RNDIS_PHYM_WIRELESS) && *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { - netif_dbg(dev, probe, dev->net, - "driver requires wireless physical medium, but device is not\n"); + if (netif_msg_probe(dev)) + dev_dbg(&intf->dev, "driver requires wireless " + "physical medium, but device is not.\n"); retval = -ENODEV; goto halt_fail_and_release; } if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) && *phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) { - netif_dbg(dev, probe, dev->net, - "driver requires non-wireless physical medium, but device is wireless.\n"); + if (netif_msg_probe(dev)) + dev_dbg(&intf->dev, "driver requires non-wireless " + "physical medium, but device is wireless.\n"); retval = -ENODEV; goto halt_fail_and_release; }