X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fvport-internal_dev.c;h=637d712d8d371a475ab017c1f9f4f609ac4455ab;hb=HEAD;hp=9ee1c42ed336b16633a3937b880b2e90c8291b50;hpb=d644d89062ee584ae1144ba52e068bba5f7b2c67;p=sliver-openvswitch.git

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 9ee1c42ed..637d712d8 100644
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -22,27 +22,20 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/netdev_features.h>
 #include <linux/skbuff.h>
 #include <linux/version.h>
 
 #include <net/dst.h>
 #include <net/xfrm.h>
 
-#include "checksum.h"
 #include "datapath.h"
 #include "vlan.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
-#define HAVE_NET_DEVICE_OPS
-#endif
-
 struct internal_dev {
 	struct vport *vport;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-	struct net_device_stats stats;
-#endif
 };
 
 static struct internal_dev *internal_dev_priv(struct net_device *netdev)
@@ -58,11 +51,7 @@ static struct rtnl_link_stats64 *internal_dev_get_stats(struct net_device *netde
 #else
 static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-	struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
-#else
 	struct net_device_stats *stats = &netdev->stats;
-#endif
 #endif
 	struct vport *vport = ovs_internal_dev_get_vport(netdev);
 	struct ovs_vport_stats vport_stats;
@@ -86,13 +75,6 @@ static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev
 /* Called with rcu_read_lock_bh. */
 static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
-	if (unlikely(compute_ip_summed(skb, true))) {
-		kfree_skb(skb);
-		return 0;
-	}
-
-	vlan_copy_skb_tci(skb);
-
 	rcu_read_lock();
 	ovs_vport_receive(internal_dev_priv(netdev)->vport, skb, NULL);
 	rcu_read_unlock();
@@ -147,7 +129,6 @@ static void internal_dev_destructor(struct net_device *dev)
 	free_netdev(dev);
 }
 
-#ifdef HAVE_NET_DEVICE_OPS
 static const struct net_device_ops internal_dev_netdev_ops = {
 	.ndo_open = internal_dev_open,
 	.ndo_stop = internal_dev_stop,
@@ -160,22 +141,12 @@ static const struct net_device_ops internal_dev_netdev_ops = {
 	.ndo_get_stats = internal_dev_sys_stats,
 #endif
 };
-#endif
 
 static void do_setup(struct net_device *netdev)
 {
 	ether_setup(netdev);
 
-#ifdef HAVE_NET_DEVICE_OPS
 	netdev->netdev_ops = &internal_dev_netdev_ops;
-#else
-	netdev->get_stats = internal_dev_sys_stats;
-	netdev->hard_start_xmit = internal_dev_xmit;
-	netdev->open = internal_dev_open;
-	netdev->stop = internal_dev_stop;
-	netdev->set_mac_address = eth_mac_addr;
-	netdev->change_mtu = internal_dev_change_mtu;
-#endif
 
 	netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
 	netdev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
@@ -184,12 +155,10 @@ static void do_setup(struct net_device *netdev)
 	netdev->tx_queue_len = 0;
 
 	netdev->features = NETIF_F_LLTX | NETIF_F_SG | NETIF_F_FRAGLIST |
-			   NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_TSO;
+			   NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_GSO_SOFTWARE;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
 	netdev->vlan_features = netdev->features;
-	netdev->features |= NETIF_F_HW_VLAN_TX;
-#endif
+	netdev->features |= NETIF_F_HW_VLAN_CTAG_TX;
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
 	netdev->hw_features = netdev->features & ~NETIF_F_LLTX;
@@ -268,8 +237,19 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 	int len;
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-	if (unlikely(vlan_deaccel_tag(skb)))
-		return 0;
+	if (vlan_tx_tag_present(skb)) {
+		if (unlikely(!__vlan_put_tag(skb,
+					     skb->vlan_proto,
+					     vlan_tx_tag_get(skb))))
+			return 0;
+
+		if (skb->ip_summed == CHECKSUM_COMPLETE)
+			skb->csum = csum_add(skb->csum,
+					     csum_partial(skb->data + (2 * ETH_ALEN),
+							  VLAN_HLEN, 0));
+
+		vlan_set_tci(skb, 0);
+	}
 #endif
 
 	len = skb->len;
@@ -282,14 +262,9 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
 	skb->pkt_type = PACKET_HOST;
 	skb->protocol = eth_type_trans(skb, netdev);
 	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
-	forward_ip_summed(skb, false);
 
 	netif_rx(skb);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
-	netdev->last_rx = jiffies;
-#endif
-
 	return len;
 }
 
@@ -303,11 +278,7 @@ const struct vport_ops ovs_internal_vport_ops = {
 
 int ovs_is_internal_dev(const struct net_device *netdev)
 {
-#ifdef HAVE_NET_DEVICE_OPS
 	return netdev->netdev_ops == &internal_dev_netdev_ops;
-#else
-	return netdev->open == internal_dev_open;
-#endif
 }
 
 struct vport *ovs_internal_dev_get_vport(struct net_device *netdev)