X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Flinux%2Fcompat%2Fnetdevice.c;h=d26fb5e2adf84662acb79aa5198eefe66e2f97ff;hb=42d5dd9595cce35a8825a20be7d71a3a8f6f5640;hp=1a6f327ad106ec00a74dd447327b5a193e0b4229;hpb=22bcc0e70becd88bf895c44885d63704affe4284;p=sliver-openvswitch.git

diff --git a/datapath/linux/compat/netdevice.c b/datapath/linux/compat/netdevice.c
index 1a6f327ad..d26fb5e2a 100644
--- a/datapath/linux/compat/netdevice.c
+++ b/datapath/linux/compat/netdevice.c
@@ -1,49 +1,102 @@
-#include <linux/if_link.h>
 #include <linux/netdevice.h>
+#include <linux/if_vlan.h>
 
-/* Linux 2.6.28 introduced dev_get_stats():
- * const struct net_device_stats *dev_get_stats(struct net_device *dev);
- *
- * Linux 2.6.36 changed dev_get_stats() to:
- * struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
- *                                         struct rtnl_link_stats64 *storage);
- */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
-struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
-					struct rtnl_link_stats64 *storage)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+#ifndef HAVE_CAN_CHECKSUM_PROTOCOL
+static bool can_checksum_protocol(unsigned long features, __be16 protocol)
 {
-	const struct net_device_stats *stats;
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
-	stats = dev->get_stats(dev);
-#else  /* 2.6.28 < kernel version < 2.6.36 */
-	stats = (dev_get_stats)(dev);
-#endif /* 2.6.28 < kernel version < 2.6.36 */
-
-	storage->rx_packets = stats->rx_packets;
-	storage->tx_packets = stats->tx_packets;
-	storage->rx_bytes = stats->rx_bytes;
-	storage->tx_bytes = stats->tx_bytes;
-	storage->rx_errors = stats->rx_errors;
-	storage->tx_errors = stats->tx_errors;
-	storage->rx_dropped = stats->rx_dropped;
-	storage->tx_dropped = stats->tx_dropped;
-	storage->multicast = stats->multicast;
-	storage->collisions = stats->collisions;
-	storage->rx_length_errors = stats->rx_length_errors;
-	storage->rx_over_errors = stats->rx_over_errors;
-	storage->rx_crc_errors = stats->rx_crc_errors;
-	storage->rx_frame_errors = stats->rx_frame_errors;
-	storage->rx_fifo_errors = stats->rx_fifo_errors;
-	storage->rx_missed_errors = stats->rx_missed_errors;
-	storage->tx_aborted_errors = stats->tx_aborted_errors;
-	storage->tx_carrier_errors = stats->tx_carrier_errors;
-	storage->tx_fifo_errors = stats->tx_fifo_errors;
-	storage->tx_heartbeat_errors = stats->tx_heartbeat_errors;
-	storage->tx_window_errors = stats->tx_window_errors;
-	storage->rx_compressed = stats->rx_compressed;
-	storage->tx_compressed = stats->tx_compressed;
-
-	return storage;
+	return  ((features & NETIF_F_GEN_CSUM) ||
+		((features & NETIF_F_V4_CSUM) &&
+				protocol == htons(ETH_P_IP)) ||
+		((features & NETIF_F_V6_CSUM) &&
+				protocol == htons(ETH_P_IPV6)) ||
+		((features & NETIF_F_FCOE_CRC) &&
+				protocol == htons(ETH_P_FCOE)));
 }
-#endif	/* kernel version < 2.6.36 */
+#endif
+
+static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
+{
+#ifdef CONFIG_HIGHMEM
+	int i;
+
+	if (dev->features & NETIF_F_HIGHDMA)
+		return 0;
+
+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
+		if (PageHighMem(skb_shinfo(skb)->frags[i].page))
+			return 1;
+
+#endif
+	return 0;
+}
+
+static u32 harmonize_features(struct sk_buff *skb, __be16 protocol, u32 features)
+{
+	if (!can_checksum_protocol(features, protocol)) {
+		features &= ~NETIF_F_ALL_CSUM;
+		features &= ~NETIF_F_SG;
+	} else if (illegal_highdma(skb->dev, skb)) {
+		features &= ~NETIF_F_SG;
+	}
+
+	return features;
+}
+
+u32 rpl_netif_skb_features(struct sk_buff *skb)
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+	unsigned long vlan_features = 0;
+#else
+	unsigned long vlan_features = skb->dev->vlan_features;
+#endif /* kernel version < 2.6.26 */
+
+	__be16 protocol = skb->protocol;
+	u32 features = skb->dev->features;
+
+	if (protocol == htons(ETH_P_8021Q)) {
+		struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
+		protocol = veh->h_vlan_encapsulated_proto;
+	} else if (!vlan_tx_tag_present(skb)) {
+		return harmonize_features(skb, protocol, features);
+	}
+
+	features &= (vlan_features | NETIF_F_HW_VLAN_TX);
+
+	if (protocol != htons(ETH_P_8021Q)) {
+		return harmonize_features(skb, protocol, features);
+	} else {
+		features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
+			NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX;
+		return harmonize_features(skb, protocol, features);
+	}
+}
+
+struct sk_buff *rpl_skb_gso_segment(struct sk_buff *skb, u32 features)
+{
+	int vlan_depth = ETH_HLEN;
+	__be16 type = skb->protocol;
+	__be16 skb_proto;
+	struct sk_buff *skb_gso;
+
+	while (type == htons(ETH_P_8021Q)) {
+		struct vlan_hdr *vh;
+
+		if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))
+			return ERR_PTR(-EINVAL);
+
+		vh = (struct vlan_hdr *)(skb->data + vlan_depth);
+		type = vh->h_vlan_encapsulated_proto;
+		vlan_depth += VLAN_HLEN;
+	}
+
+	/* this hack needed to get regular skb_gso_segment() */
+#undef skb_gso_segment
+	skb_proto = skb->protocol;
+	skb->protocol = type;
+
+	skb_gso = skb_gso_segment(skb, features);
+	skb->protocol = skb_proto;
+	return skb_gso;
+}
+#endif	/* kernel version < 2.6.38 */