1 files changed, 14 insertions, 4 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 42b6c6319bc2..2533f5cf2e4b 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -398,12 +398,12 @@ static int tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
         if (tun->flags & TUN_FASYNC)
                 kill_fasync(&tun->fasync, SIGIO, POLL_IN);
         wake_up_interruptible(&tun->socket.wait);
-        return 0;
+        return NETDEV_TX_OK;
 
 drop:
         dev->stats.tx_dropped++;
         kfree_skb(skb);
-        return 0;
+        return NETDEV_TX_OK;
 }
 
 static void tun_net_mclist(struct net_device *dev)
@@ -641,6 +641,9 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
                 case VIRTIO_NET_HDR_GSO_TCPV6:
                         skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
                         break;
+                case VIRTIO_NET_HDR_GSO_UDP:
+                        skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+                        break;
                 default:
                         tun->dev->stats.rx_frame_errors++;
                         kfree_skb(skb);
@@ -726,6 +729,8 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
                                 gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
                         else if (sinfo->gso_type & SKB_GSO_TCPV6)
                                 gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
+                        else if (sinfo->gso_type & SKB_GSO_UDP)
+                                gso.gso_type = VIRTIO_NET_HDR_GSO_UDP;
                         else
                                 BUG();
                         if (sinfo->gso_type & SKB_GSO_TCP_ECN)
@@ -997,7 +1002,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                                 goto err_free_sk;
                 }
 
-                err = -EINVAL;
                 err = register_netdevice(tun->dev);
                 if (err < 0)
                         goto err_free_sk;
@@ -1069,7 +1073,8 @@ static int set_offload(struct net_device *dev, unsigned long arg)
         old_features = dev->features;
         /* Unset features, set them as we chew on the arg. */
         features = (old_features & ~(NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST
-                                    |NETIF_F_TSO_ECN|NETIF_F_TSO|NETIF_F_TSO6));
+                                    |NETIF_F_TSO_ECN|NETIF_F_TSO|NETIF_F_TSO6
+                                    |NETIF_F_UFO));
 
         if (arg & TUN_F_CSUM) {
                 features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
@@ -1086,6 +1091,11 @@ static int set_offload(struct net_device *dev, unsigned long arg)
                                 features |= NETIF_F_TSO6;
                         arg &= ~(TUN_F_TSO4|TUN_F_TSO6);
                 }
+
+                if (arg & TUN_F_UFO) {
+                        features |= NETIF_F_UFO;
+                        arg &= ~TUN_F_UFO;
+                }
         }
 
         /* This gives the user a way to test for new features in future by