Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-bionic-kernel.git] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index c3af08f24679bea4eb09ffdb8bcb0c7e457f22e2..95749006d687b971a49894c903fcc611bc25c375 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2372,6 +2372,8 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
                                features |= NETIF_F_TSO6;
                        arg &= ~(TUN_F_TSO4|TUN_F_TSO6);
                }
+
+               arg &= ~TUN_F_UFO;
        }
 
        /* This gives the user a way to test for new features in future by