xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Gao Feng <fgao@ikuai8.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gao Feng
2016-10-27 09:05:22 +08:00
committed by David S. Miller
parent c62cce2cae
commit 20861f26e3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tun.c
View File

@@ -1985,7 +1985,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
int le; int le;
int ret; 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)) if (copy_from_user(&ifr, argp, ifreq_len))
return -EFAULT; return -EFAULT;
} else { } else {

2
include/uapi/linux/sockios.h
View File

@@ -24,6 +24,8 @@
#define SIOCINQ FIONREAD #define SIOCINQ FIONREAD
#define SIOCOUTQ TIOCOUTQ /* output queue size (not sent + not acked) */ #define SIOCOUTQ TIOCOUTQ /* output queue size (not sent + not acked) */
#define SOCK_IOC_TYPE 0x89
/* Routing table calls. */ /* Routing table calls. */
#define SIOCADDRT 0x890B /* add routing table entry */ #define SIOCADDRT 0x890B /* add routing table entry */
#define SIOCDELRT 0x890C /* delete routing table entry */ #define SIOCDELRT 0x890C /* delete routing table entry */