2 files changed, 15 insertions, 7 deletions

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c827d69b5a91..63c9c05d6147 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1140,6 +1140,8 @@ static int qeth_setup_card(struct qeth_card *card)
         card->ipato.enabled = 0;
         card->ipato.invert4 = 0;
         card->ipato.invert6 = 0;
+        if (card->info.type == QETH_CARD_TYPE_IQD)
+                card->options.checksum_type = NO_CHECKSUMMING;
         /* init QDIO stuff */
         qeth_init_qdio_info(card);
         return 0;
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 5873240c3cea..b36b5cdf9000 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1920,16 +1920,22 @@ static inline __u16 qeth_l3_rebuild_skb(struct qeth_card *card,
                  hdr->hdr.l3.vlan_id : *((u16 *)&hdr->hdr.l3.dest_addr[12]);
         }
 
-        skb->ip_summed = card->options.checksum_type;
-        if (card->options.checksum_type == HW_CHECKSUMMING) {
+        switch (card->options.checksum_type) {
+        case SW_CHECKSUMMING:
+                skb->ip_summed = CHECKSUM_NONE;
+                break;
+        case NO_CHECKSUMMING:
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                break;
+        case HW_CHECKSUMMING:
                 if ((hdr->hdr.l3.ext_flags &
-                      (QETH_HDR_EXT_CSUM_HDR_REQ |
-                       QETH_HDR_EXT_CSUM_TRANSP_REQ)) ==
-                     (QETH_HDR_EXT_CSUM_HDR_REQ |
-                      QETH_HDR_EXT_CSUM_TRANSP_REQ))
+                    (QETH_HDR_EXT_CSUM_HDR_REQ |
+                     QETH_HDR_EXT_CSUM_TRANSP_REQ)) ==
+                    (QETH_HDR_EXT_CSUM_HDR_REQ |
+                     QETH_HDR_EXT_CSUM_TRANSP_REQ))
                         skb->ip_summed = CHECKSUM_UNNECESSARY;
                 else
-                        skb->ip_summed = SW_CHECKSUMMING;
+                        skb->ip_summed = CHECKSUM_NONE;
         }
 
         return vlan_id;