qeth: fix rx checksum offload handling

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / net / qeth_l3_main.c

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 04e42c649134c1989a3485b01ff2a43cc380a82d..70eb2f61bb9269221f4c389838b67bf90fc071ba 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3198,8 +3198,7 @@ static int qeth_l3_set_features(struct net_device *dev,
        netdev_features_t features)
 {
        struct qeth_card *card = dev->ml_priv;
-       u32 changed = dev->features ^ features;
-       int err;
+       netdev_features_t changed = dev->features ^ features;
 
        if (!(changed & NETIF_F_RXCSUM))
                return 0;
@@ -3208,11 +3207,7 @@ static int qeth_l3_set_features(struct net_device *dev,
            card->state == CARD_STATE_RECOVER)
                return 0;
 
-       err = qeth_l3_set_rx_csum(card, features & NETIF_F_RXCSUM);
-       if (err)
-               dev->features = features ^ NETIF_F_RXCSUM;
-
-       return err;
+       return qeth_l3_set_rx_csum(card, features & NETIF_F_RXCSUM ? 1 : 0);
 }
 
 static const struct ethtool_ops qeth_l3_ethtool_ops = {