From a4d269f7878142b281e40b5f86321def246bae66 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 30 May 2012 07:43:34 +0000 Subject: [PATCH] --- yaml --- r: 309515 b: refs/heads/master c: 0053ea9c34a41865ec89ffbf3d3033f9a503bccc h: refs/heads/master i: 309513: d8b43cef5dcb5f7f8b934adfef7b20ab2a2620bb 309511: 52f88f5692b3661dc16cc36317ea74552ac6a7d3 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3300271721b6..0371d8f267c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0f68763e1c7dd57fa2dae3c07bc50651e2eac29 +refs/heads/master: 0053ea9c34a41865ec89ffbf3d3033f9a503bccc diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index e7fd468f7126..d94cb1431519 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -2795,15 +2795,15 @@ do { \ #define netif_info(priv, type, dev, fmt, args...) \ netif_level(info, priv, type, dev, fmt, ##args) -#if defined(DEBUG) -#define netif_dbg(priv, type, dev, format, args...) \ - netif_printk(priv, type, KERN_DEBUG, dev, format, ##args) -#elif defined(CONFIG_DYNAMIC_DEBUG) +#if defined(CONFIG_DYNAMIC_DEBUG) #define netif_dbg(priv, type, netdev, format, args...) \ do { \ if (netif_msg_##type(priv)) \ dynamic_netdev_dbg(netdev, format, ##args); \ } while (0) +#elif defined(DEBUG) +#define netif_dbg(priv, type, dev, format, args...) \ + netif_printk(priv, type, KERN_DEBUG, dev, format, ##args) #else #define netif_dbg(priv, type, dev, format, args...) \ ({ \