diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2016-04-14 18:39:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-18 20:36:26 +0200 |
| commit | 2a2bbf170054e2525f11e08bb36d4027d76b7bff (patch) | |
| tree | 7190ee48c0ec5310fef9d7380019a5cd0ab5e634 /drivers/net/tun.c | |
| parent | udp: fix if statement in SIOCINQ ioctl (diff) | |
| download | linux-2a2bbf170054e2525f11e08bb36d4027d76b7bff.tar.xz linux-2a2bbf170054e2525f11e08bb36d4027d76b7bff.zip | |
tun: don't require serialization lock on tx
The current tun_net_xmit() implementation don't need any external
lock since it relies on rcu protection for the tun data structure
and on socket queue lock for skb queuing.
This patch set the NETIF_F_LLTX feature bit in the tun device, so
that on xmit, in absence of qdisc, no serialization lock is acquired
by the caller.
The user space can remove the default tun qdisc with:
tc qdisc replace dev <tun device name> root noqueue
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index faf9297db2cf..42992dcbdda8 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1796,7 +1796,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; - dev->features = dev->hw_features; + dev->features = dev->hw_features | NETIF_F_LLTX; dev->vlan_features = dev->features & ~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX); |