From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.candelatech.com ([208.74.158.172]:48494 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750900Ab2CJRQ1 (ORCPT ); Sat, 10 Mar 2012 12:16:27 -0500 Message-ID: <4F5B8C66.4060808@candelatech.com> (sfid-20120310_181631_281918_50A11B62) Date: Sat, 10 Mar 2012 09:16:22 -0800 From: Ben Greear MIME-Version: 1.0 To: Johannes Berg CC: linux-wireless@vger.kernel.org Subject: Re: [PATCH] mac80211: Add iface name when calling WARN-ON. References: <1331318216-27235-1-git-send-email-greearb@candelatech.com> (sfid-20120310_015306_799372_9A7E4047) <1331366543.3348.1.camel@jlt3.sipsolutions.net> In-Reply-To: <1331366543.3348.1.camel@jlt3.sipsolutions.net> Content-Type: text/plain; charset=UTF-8; format=flowed Sender: linux-wireless-owner@vger.kernel.org List-ID: On 03/10/2012 12:02 AM, Johannes Berg wrote: > On Fri, 2012-03-09 at 10:36 -0800, greearb@candelatech.com wrote: >> From: Ben Greear >> >> This lets the user know which interface has failed >> the check_sdata_in_driver check. >> >> Signed-off-by: Ben Greear >> --- >> :100644 100644 e8960ae... e62e7c3... M net/mac80211/driver-ops.h >> net/mac80211/driver-ops.h | 6 +++++- >> 1 files changed, 5 insertions(+), 1 deletions(-) >> >> diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h >> index e8960ae..e62e7c3 100644 >> --- a/net/mac80211/driver-ops.h >> +++ b/net/mac80211/driver-ops.h >> @@ -7,7 +7,11 @@ >> >> static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata) >> { >> - WARN_ON(!(sdata->flags& IEEE80211_SDATA_IN_DRIVER)); >> + if (unlikely(!(sdata->flags& IEEE80211_SDATA_IN_DRIVER))) { >> + printk(KERN_ERR "%s: Failed check-sdata-in-driver check, flags: 0x%x\n", >> + sdata->dev->name, sdata->flags); >> + WARN_ON(1); >> + } > > How about WARN(!(...), ...) instead -- that way the message will be part > of the warning too. > > johannes Sure. Also, should I maybe un-inline this thing since it is now a bit bigger code wise? Thanks, Ben -- Ben Greear Candela Technologies Inc http://www.candelatech.com