---

yaml --- r: 186573 b: refs/heads/master c: 4ce21a7 h: refs/heads/master i: 186571: c79746d v: v3
git-mirror · Mar 4, 2010 · 0570028 · 0570028
1 parent c5b0173
commit 0570028
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183cd9ee543c9364fa42be8d30265fd47a914b59
+refs/heads/master: 4ce21a7faf320bdb750a2e1639f8f2dbb27bdb89
diff --git a/trunk/drivers/staging/batman-adv/TODO b/trunk/drivers/staging/batman-adv/TODO
@@ -29,12 +29,6 @@
 -> PRIMARY)
 
 => logging
-* the log level LOG_TYPE_CRIT, LOG_TYPE_WARN & LOG_TYPE_NOTICE will be
-* unified to use printk
-* LOG_TYPE_BATMAN & LOG_TYPE_ROUTES will also use printk but only after the
-* internal debug level has been raised
-* the internal debug level can be modified using a module parameter (debug)
-* or at run time via /sys/module/batman-adv/parameters/debug
 * make use of printk %pM support instead of converting mac addresses
 * manually
 

diff --git a/trunk/drivers/staging/batman-adv/device.c b/trunk/drivers/staging/batman-adv/device.c
@@ -207,7 +207,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
 	struct batman_if *batman_if;
 
 	if (len < sizeof(struct icmp_packet)) {
-		printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: invalid packet size\n");
+		bat_dbg(DBG_BATMAN, "batman-adv:Error - can't send packet from char device: invalid packet size\n");
 		return -EINVAL;
 	}
 
@@ -218,12 +218,12 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
 		return -EFAULT;
 
 	if (icmp_packet.packet_type != BAT_ICMP) {
-		printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
+		bat_dbg(DBG_BATMAN, "batman-adv:Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
 		return -EINVAL;
 	}
 
 	if (icmp_packet.msg_type != ECHO_REQUEST) {
-		printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
+		bat_dbg(DBG_BATMAN, "batman-adv:Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
 		return -EINVAL;
 	}