diff options
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 7 | 
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a7d17c680f4a..ad653b32b2f0 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1401,6 +1401,11 @@ static void tun_net_initialize(struct net_device *dev)  		eth_hw_addr_random(dev); +		/* Currently tun does not support XDP, only tap does. */ +		dev->xdp_features = NETDEV_XDP_ACT_BASIC | +				    NETDEV_XDP_ACT_REDIRECT | +				    NETDEV_XDP_ACT_NDO_XMIT; +  		break;  	} @@ -3448,7 +3453,7 @@ static int tun_chr_open(struct inode *inode, struct file * file)  	tfile->socket.file = file;  	tfile->socket.ops = &tun_socket_ops; -	sock_init_data(&tfile->socket, &tfile->sk); +	sock_init_data_uid(&tfile->socket, &tfile->sk, inode->i_uid);  	tfile->sk.sk_write_space = tun_sock_write_space;  	tfile->sk.sk_sndbuf = INT_MAX;  |