Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / datapath / vport-internal_dev.c

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index be29074..fff4f4e 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -6,6 +6,7 @@
  * kernel, by Linus Torvalds and others.
  */
 
+#include <linux/if_vlan.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -131,6 +132,14 @@ static int internal_dev_do_ioctl(struct net_device *dev, struct ifreq *ifr, int
        return -EOPNOTSUPP;
 }
 
+static void internal_dev_destructor(struct net_device *dev)
+{
+       struct vport *vport = internal_dev_get_vport(dev);
+
+       vport_free(vport);
+       free_netdev(dev);
+}
+
 #ifdef HAVE_NET_DEVICE_OPS
 static const struct net_device_ops internal_dev_netdev_ops = {
        .ndo_open = internal_dev_open,
@@ -159,7 +168,7 @@ static void do_setup(struct net_device *netdev)
        netdev->change_mtu = internal_dev_change_mtu;
 #endif
 
-       netdev->destructor = free_netdev;
+       netdev->destructor = internal_dev_destructor;
        SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
        netdev->tx_queue_len = 0;
 
@@ -167,6 +176,11 @@ static void do_setup(struct net_device *netdev)
        netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
                                NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+       netdev->vlan_features = netdev->features;
+       netdev->features |= NETIF_F_HW_VLAN_TX;
+#endif
+
        vport_gen_rand_ether_addr(netdev->dev_addr);
 }
 
@@ -218,9 +232,8 @@ static int internal_dev_destroy(struct vport *vport)
        netif_stop_queue(netdev_vport->dev);
        dev_set_promiscuity(netdev_vport->dev, -1);
 
-       unregister_netdevice(netdev_vport->dev);
        /* unregister_netdevice() waits for an RCU grace period. */
-       vport_free(vport);
+       unregister_netdevice(netdev_vport->dev);
 
        return 0;
 }
@@ -230,8 +243,13 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
        struct net_device *netdev = netdev_vport_priv(vport)->dev;
        int len;
 
-       skb->dev = netdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
+       if (unlikely(vlan_deaccel_tag(skb)))
+               return 0;
+#endif
+
        len = skb->len;
+       skb->dev = netdev;
        skb->pkt_type = PACKET_HOST;
        skb->protocol = eth_type_trans(skb, netdev);