netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-2.6] net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined
@ 2010-07-02 17:08 Ben Hutchings
  2010-07-06  3:08 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Ben Hutchings @ 2010-07-02 17:08 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-net-drivers, Joe Perches

netif_vdbg() was originally defined as entirely equivalent to
netdev_vdbg(), but I assume that it was intended to take the same
parameters as netif_dbg() etc.  (Currently it is only used by the
sfc driver, in which I worked on that assumption.)

In commit a4ed89c I changed the definition used when VERBOSE_DEBUG is
not defined, but I failed to notice that the definition used when
VERBOSE_DEBUG is defined was also not as I expected.  Change that to
match netif_dbg() as well.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
Since there are no users of this macro in net-2.6, this should be safe
to change.  If you don't want to make this change in net-2.6 then please
revert a4ed89c in net-2.6 and apply this in net-next-2.6 so that the two
alternate definitions are consistent in each tree.

Ben.

 include/linux/netdevice.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8fa5e5a..f823fd8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2352,7 +2352,7 @@ do {								\
 #endif
 
 #if defined(VERBOSE_DEBUG)
-#define netif_vdbg	netdev_dbg
+#define netif_vdbg	netif_dbg
 #else
 #define netif_vdbg(priv, type, dev, format, args...)		\
 ({								\
-- 
1.6.2.5

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-2.6] net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined
  2010-07-02 17:08 [PATCH net-2.6] net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined Ben Hutchings
@ 2010-07-06  3:08 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-07-06  3:08 UTC (permalink / raw)
  To: bhutchings; +Cc: netdev, linux-net-drivers, joe

From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 02 Jul 2010 18:08:44 +0100

> netif_vdbg() was originally defined as entirely equivalent to
> netdev_vdbg(), but I assume that it was intended to take the same
> parameters as netif_dbg() etc.  (Currently it is only used by the
> sfc driver, in which I worked on that assumption.)
> 
> In commit a4ed89c I changed the definition used when VERBOSE_DEBUG is
> not defined, but I failed to notice that the definition used when
> VERBOSE_DEBUG is defined was also not as I expected.  Change that to
> match netif_dbg() as well.
> 
> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>

Applied to net-2.6, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-06  3:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-02 17:08 [PATCH net-2.6] net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined Ben Hutchings
2010-07-06  3:08 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).