Skip to content

Commit

Permalink
tun: drop useless debugging statements
Browse files Browse the repository at this point in the history
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: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michal Kubecek authored and David S. Miller committed Mar 6, 2020
1 parent 7522416 commit 1820943
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions drivers/net/tun.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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.
*/
Expand Down Expand Up @@ -2870,8 +2862,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)

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);
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 1820943

Please sign in to comment.