batman-adv: Fix wrongly formatted %pM in bat_dbg()
PATCH 1/1 batman-adv: Fix wrongly formatted %pM in bat_dbg()
bat_dbg() invokes debug_log() which invokes the kernel's vscnprintf(), which invokes the kernel's vsnprintf(), and not the customized bat_vsnprintf(), which backports the %pM to older kernel versions!
Therefore this commit ports a customized vscnprintf() to bat_printk.c, too, making mac addresses being displayed correctly with bat_dbg() again.
--- bat_printk.c | 25 +++++++++++++++++++++++++ compat.h | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-)
bat_printk.c +25 -0
@@ -838,6 +838,31 @@ static int bat_vsnprintf(char *buf, size_t size, const char *fmt, va_list args) }/** +* bat_vscnprintf - Format a string and place it in a buffer +* @buf: The buffer to place the result into +* @size: The size of the buffer, including the trailing null space +* @fmt: The format string to use +* @args: Arguments for the format string +* +* The return value is the number of characters which have been written into +* the @buf not including the trailing '\0'. If @size is <= 0 the function +* returns 0. +* +* Call this function if you are already dealing with a va_list. +* You probably want scnprintf() instead. +* +* See the vsnprintf() documentation for format string extensions over C99. +*/ +int bat_vscnprintf (char *buf,size_t size,const char *fmt,va_list args) +{ +int i; + + i =bat_vsnprintf (buf, size, fmt, args); + +return (i >= size) ? (size -1 ) : i; +} + +/** * bat_printk - print a kernel message using extra %p formatting * strings, forward compatible with kernel version 2.6.31 printk, minus * *p[sS].
compat.h +3 -0
@@ -256,6 +256,9 @@ next_sibling:#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,29 ) +int bat_vscnprintf (char *buf,size_t size,const char *fmt,va_list args); +#define vscnprintf bat_vscnprintf + asmlinkage int bat_printk(const char *fmt, ...);#define printk bat_printk
Signature · 1 line
1.7.1
Marek Lindner
AppliedQuoted 7 lines · On Sunday 10 October 2010 15:38:11 Linus Lüssing wrote:
bat_dbg()invokesdebug_log()which invokes the kernel'svscnprintf(), which invokes the kernel'svsnprintf(), and not the customizedbat_vsnprintf(), which backports the %pM to older kernel versions!Therefore this commit ports a customized
vscnprintf()tobat_printk.c, too, making mac addresses being displayed correctly withbat_dbg()again.
Applied in revision 1825.
Thanks,
Marek