From: David S. Miller Date: Fri, 6 Mar 2020 05:38:03 +0000 (-0800) Subject: Merge branch 'tun-debug' X-Git-Tag: Ubuntu-5.13.0-19.19~6375^2~234 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=425c075dcbb2009a526fffb40ada846acc40d2b1;p=mirror_ubuntu-jammy-kernel.git Merge branch 'tun-debug' Michal Kubecek says: ==================== tun: debug messages cleanup While testing ethtool output for "strange" devices, I noticed confusing and obviously incorrect message level information for a tun device and sent a quick fix. The result of the upstream discussion was that tun driver would rather deserve a more complex cleanup of the way it handles debug messages. The main problem is that all debugging statements and setting of message level are controlled by TUN_DEBUG macro which is only defined if one edits the source and rebuilds the module, otherwise all DBG1() and tun_debug() statements do nothing. This series drops the TUN_DEBUG switch and replaces custom tun_debug() macro with standard netif_info() so that message level (mask) set and displayed using ethtool works as expected. Some debugging messages are dropped as they only notify about entering a function which can be done easily using ftrace or kprobe. Patch 1 is a trivial fix for compilation warning with W=1. ==================== Signed-off-by: David S. Miller --- 425c075dcbb2009a526fffb40ada846acc40d2b1