Signed-off-by: Pavel Roskin <proski@gnu.org>

Debian backports netdev_name as a function.  As we cannot test if a
function is present, use an equivalent macro.

Reported by Sivaraman V <krusna@gmail.com> and Alex <alex9434@gmail.com>

diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h
index 9743d6c1fde034b50f1dce0d80cc3da8b2b6c540..bada7005bb097947f4de1d0b231ac3060eeabaea 100644 (file)
--- a/include/linux/compat-2.6.34.h
+++ b/include/linux/compat-2.6.34.h
@@ -20,12 +20,11 @@
 
 /* netdev_printk helpers, similar to dev_printk */
 
-static inline const char *netdev_name(const struct net_device *dev)
-{
-       if (dev->reg_state != NETREG_REGISTERED)
-               return "(unregistered net_device)";
-       return dev->name;
-}
+#ifndef netdev_name
+#define netdev_name(__dev) \
+       ((__dev->reg_state != NETREG_REGISTERED) ? \
+               "(unregistered net_device)" : __dev->name)
+#endif
 
 #define netdev_printk(level, netdev, format, args...)          \
        dev_printk(level, (netdev)->dev.parent,                 \