[linux-next] LinuxNextTracking branch, master, updated. next-20120621

batman at open-mesh.org batman at open-mesh.org
Fri Jun 22 00:17:07 CEST 2012


The following commit has been merged in the master branch:
commit ef3a409391f55ad0bddbf017d4d4987b783a3059
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Wed May 9 09:50:45 2012 +0200

    batman-adv: use DBG_ALL in log_level sysfs definition
    
    Each time a new log level is added the developer must change either the DBG_ALL
    enum definition and the hard coded value in the bat_sysfs.c for the log_level
    attribute max value. This is extremely error prone.
    With this patch the code directly uses DBG_ALL in the sysfs definition
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/bat_sysfs.c b/net/batman-adv/bat_sysfs.c
index 62f4f6c..dc1edbe 100644
--- a/net/batman-adv/bat_sysfs.c
+++ b/net/batman-adv/bat_sysfs.c
@@ -445,7 +445,7 @@ BAT_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, TQ_MAX_VALUE,
 static BAT_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, show_gw_bwidth,
 		store_gw_bwidth);
 #ifdef CONFIG_BATMAN_ADV_DEBUG
-BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL);
+BAT_ATTR_SIF_UINT(log_level, S_IRUGO | S_IWUSR, 0, DBG_ALL, NULL);
 #endif
 
 static struct bat_attribute *mesh_attrs[] = {

-- 
LinuxNextTracking


More information about the linux-merge mailing list