Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 10 insertions, 44 deletions

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 5ec542dd5b50..8461576fa015 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -22,7 +22,6 @@
 
 #define MIN_MTU 68              /* Min L3 MTU */
 #define MAX_MTU 65535           /* Max L3 MTU (arbitrary) */
-#define MTU_PAD (ETH_HLEN + 4)  /* Max difference between L2 and L3 size MTU */
 
 struct veth_net_stats {
         unsigned long   rx_packets;
@@ -36,7 +35,6 @@ struct veth_net_stats {
 struct veth_priv {
         struct net_device *peer;
         struct veth_net_stats __percpu *stats;
-        unsigned ip_summed;
 };
 
 /*
@@ -53,7 +51,7 @@ static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
         cmd->supported          = 0;
         cmd->advertising        = 0;
-        cmd->speed              = SPEED_10000;
+        ethtool_cmd_speed_set(cmd, SPEED_10000);
         cmd->duplex             = DUPLEX_FULL;
         cmd->port               = PORT_TP;
         cmd->phy_address        = 0;
@@ -99,47 +97,10 @@ static void veth_get_ethtool_stats(struct net_device *dev,
         data[0] = priv->peer->ifindex;
 }
 
-static u32 veth_get_rx_csum(struct net_device *dev)
-{
-        struct veth_priv *priv;
-
-        priv = netdev_priv(dev);
-        return priv->ip_summed == CHECKSUM_UNNECESSARY;
-}
-
-static int veth_set_rx_csum(struct net_device *dev, u32 data)
-{
-        struct veth_priv *priv;
-
-        priv = netdev_priv(dev);
-        priv->ip_summed = data ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE;
-        return 0;
-}
-
-static u32 veth_get_tx_csum(struct net_device *dev)
-{
-        return (dev->features & NETIF_F_NO_CSUM) != 0;
-}
-
-static int veth_set_tx_csum(struct net_device *dev, u32 data)
-{
-        if (data)
-                dev->features |= NETIF_F_NO_CSUM;
-        else
-                dev->features &= ~NETIF_F_NO_CSUM;
-        return 0;
-}
-
 static const struct ethtool_ops veth_ethtool_ops = {
         .get_settings           = veth_get_settings,
         .get_drvinfo            = veth_get_drvinfo,
         .get_link               = ethtool_op_get_link,
-        .get_rx_csum            = veth_get_rx_csum,
-        .set_rx_csum            = veth_set_rx_csum,
-        .get_tx_csum            = veth_get_tx_csum,
-        .set_tx_csum            = veth_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
         .get_strings            = veth_get_strings,
         .get_sset_count         = veth_get_sset_count,
         .get_ethtool_stats      = veth_get_ethtool_stats,
@@ -166,10 +127,13 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
         if (!(rcv->flags & IFF_UP))
                 goto tx_drop;
 
-        if (dev->features & NETIF_F_NO_CSUM)
-                skb->ip_summed = rcv_priv->ip_summed;
+        /* don't change ip_summed == CHECKSUM_PARTIAL, as that
+           will cause bad checksum on forwarded packets */
+        if (skb->ip_summed == CHECKSUM_NONE &&
+            rcv->features & NETIF_F_RXCSUM)
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-        length = skb->len + ETH_HLEN;
+        length = skb->len;
         if (dev_forward_skb(rcv, skb) != NET_RX_SUCCESS)
                 goto rx_drop;
 
@@ -250,7 +214,7 @@ static int veth_close(struct net_device *dev)
 
 static int is_valid_veth_mtu(int new_mtu)
 {
-        return (new_mtu >= MIN_MTU && new_mtu <= MAX_MTU);
+        return new_mtu >= MIN_MTU && new_mtu <= MAX_MTU;
 }
 
 static int veth_change_mtu(struct net_device *dev, int new_mtu)
@@ -302,6 +266,8 @@ static void veth_setup(struct net_device *dev)
         dev->ethtool_ops = &veth_ethtool_ops;
         dev->features |= NETIF_F_LLTX;
         dev->destructor = veth_dev_free;
+
+        dev->hw_features = NETIF_F_NO_CSUM | NETIF_F_SG | NETIF_F_RXCSUM;
 }
 
 /*