X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;h=0075f26cff3f426a71bd43b3c91565e55c366788;hp=59bbbe5a73d9201254790de2e74abc38973929d3;hb=aa1e71895c58fde1c57ff1d3386034ec0333afcc;hpb=e516972854b5330713e192f72139986bcf70d1a5

diff --git a/jme.h b/jme.h
index 59bbbe5..0075f26 100644
--- a/jme.h
+++ b/jme.h
@@ -41,8 +41,14 @@
 	NETIF_MSG_TX_ERR | \
 	NETIF_MSG_HW)
 
-#define jeprintk(pdev, fmt, args...) \
-	printk(KERN_ERR PFX fmt, ## args)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+#define pr_err(fmt, arg...) \
+	printk(KERN_ERR fmt, ##arg)
+#endif
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,33)
+#define netdev_err(netdev, fmt, arg...) \
+	pr_err(fmt, ##arg)
+#endif
 
 #ifdef TX_DEBUG
 #define tx_dbg(priv, fmt, args...)					\
@@ -55,7 +61,6 @@ do {									\
 } while (0)
 #endif
 
-#include <linux/version.h>
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,33)
 #define jme_msg(msglvl, type, priv, fmt, args...) \
 	if (netif_msg_##type(priv)) \
@@ -87,6 +92,11 @@ do {									\
 
 #define msg_hw(priv, fmt, args...) \
 	jme_msg(KERN_ERR, hw, priv, fmt, ## args)
+
+#define netif_info(priv, type, dev, fmt, args...) \
+	msg_ ## type(priv, fmt, ## args)
+#define netif_err(priv, type, dev, fmt, args...) \
+	msg_ ## type(priv, fmt, ## args)
 #endif
 
 /*