datapath: Check for backported netdev_features_t.

[sliver-openvswitch.git] / datapath / linux / compat / netdevice.c

diff --git a/datapath/linux/compat/netdevice.c b/datapath/linux/compat/netdevice.c
index 91855c4..1dc5abf 100644 (file)
--- a/datapath/linux/compat/netdevice.c
+++ b/datapath/linux/compat/netdevice.c
@@ -1,56 +1,9 @@
-#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)
-{
-       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;
-}
-#endif /* kernel version < 2.6.36 */
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-static bool can_checksum_protocol(unsigned long features, __be16 protocol)
+#ifndef HAVE_CAN_CHECKSUM_PROTOCOL
+static bool can_checksum_protocol(netdev_features_t features, __be16 protocol)
 {
        return  ((features & NETIF_F_GEN_CSUM) ||
                ((features & NETIF_F_V4_CSUM) &&
@@ -60,6 +13,7 @@ static bool can_checksum_protocol(unsigned long features, __be16 protocol)
                ((features & NETIF_F_FCOE_CRC) &&
                                protocol == htons(ETH_P_FCOE)));
 }
+#endif
 
 static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
 {
@@ -77,7 +31,9 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
        return 0;
 }
 
-static u32 harmonize_features(struct sk_buff *skb, __be16 protocol, u32 features)
+static netdev_features_t harmonize_features(struct sk_buff *skb,
+                                           __be16 protocol,
+                                           netdev_features_t features)
 {
        if (!can_checksum_protocol(features, protocol)) {
                features &= ~NETIF_F_ALL_CSUM;
@@ -89,16 +45,12 @@ static u32 harmonize_features(struct sk_buff *skb, __be16 protocol, u32 features
        return features;
 }
 
-u32 rpl_netif_skb_features(struct sk_buff *skb)
+netdev_features_t 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;
+       netdev_features_t features = skb->dev->features;
 
        if (protocol == htons(ETH_P_8021Q)) {
                struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb->data;
@@ -118,7 +70,8 @@ u32 rpl_netif_skb_features(struct sk_buff *skb)
        }
 }
 
-struct sk_buff *rpl_skb_gso_segment(struct sk_buff *skb, u32 features)
+struct sk_buff *rpl_skb_gso_segment(struct sk_buff *skb,
+                                   netdev_features_t features)
 {
        int vlan_depth = ETH_HLEN;
        __be16 type = skb->protocol;