Commit 18209434 authored by Michal Kubecek's avatar Michal Kubecek Committed by David S. Miller
Browse files

tun: drop useless debugging statements 



Some of the tun_debug() statements only inform us about entering
a function which can be easily achieved with ftrace or kprobe. As
tun_debug() is no-op unless TUN_DEBUG is set which requires editing the
source and recompiling, setting up ftrace or kprobe is easier. Drop these
debug statements.

Also drop the tun_debug() statement informing about SIOCSIFHWADDR ioctl.
We can monitor these through rtnetlink and it makes little sense to log
address changes through ioctl but not changes through rtnetlink. Moreover,
this tun_debug() is called even if the actual address change fails which
makes it even less useful.

Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7522416d

drivers/net/tun.c

+0 −13
Original line number Diff line number Diff line
@@ -473,8 +473,6 @@ static void tun_flow_cleanup(struct timer_list *t) 
	unsigned long count = 0;

	int i;



	tun_debug(KERN_INFO, tun, "tun_flow_cleanup\n");



	spin_lock(&tun->lock);

	for (i = 0; i < TUN_NUM_FLOW_ENTRIES; i++) {

		struct tun_flow_entry *e;
@@ -1420,8 +1418,6 @@ static __poll_t tun_chr_poll(struct file *file, poll_table *wait) 


	sk = tfile->socket.sk;



	tun_debug(KERN_INFO, tun, "tun_chr_poll\n");



	poll_wait(file, sk_sleep(sk), wait);



	if (!ptr_ring_empty(&tfile->tx_ring))
@@ -2192,8 +2188,6 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, 
	ssize_t ret;

	int err;



	tun_debug(KERN_INFO, tun, "tun_do_read\n");



	if (!iov_iter_count(to)) {

		tun_ptr_free(ptr);

		return 0;
@@ -2838,8 +2832,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 


	netif_carrier_on(tun->dev);



	tun_debug(KERN_INFO, tun, "tun_set_iff\n");



	/* Make sure persistent devices do not get stuck in

	 * xoff state.

	 */
@@ -2870,8 +2862,6 @@ err_free_dev: 


static void tun_get_iff(struct tun_struct *tun, struct ifreq *ifr)

{

	tun_debug(KERN_INFO, tun, "tun_get_iff\n");



	strcpy(ifr->ifr_name, tun->dev->name);



	ifr->ifr_flags = tun_flags(tun);
@@ -3206,9 +3196,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 


	case SIOCSIFHWADDR:

		/* Set hw address */

		tun_debug(KERN_DEBUG, tun, "set hw address: %pM\n",

			  ifr.ifr_hwaddr.sa_data);



		ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr, NULL);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE