Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20861f26 authored by Gao Feng's avatar Gao Feng Committed by David S. Miller
Browse files

driver: tun: Use new macro SOCK_IOC_TYPE instead of literal number 0x89 



The current codes use _IOC_TYPE(cmd) == 0x89 to check if the cmd is one
socket ioctl command like SIOCGIFHWADDR. But the literal number 0x89 may
confuse readers. So create one macro SOCK_IOC_TYPE to enhance the readability.

Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c62cce2c

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -1985,7 +1985,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 
	int le;

	int ret;



	if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {

	if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == SOCK_IOC_TYPE) {

		if (copy_from_user(&ifr, argp, ifreq_len))

			return -EFAULT;

	} else {

include/uapi/linux/sockios.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#define SIOCINQ		FIONREAD

#define SIOCOUTQ	TIOCOUTQ        /* output queue size (not sent + not acked) */



#define SOCK_IOC_TYPE	0x89



/* Routing table calls. */

#define SIOCADDRT	0x890B		/* add routing table entry	*/

#define SIOCDELRT	0x890C		/* delete routing table entry	*/