include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[net-next-2.6.git] / drivers / s390 / net / qeth_core_main.c

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index fa8a519218acc81f1b4af5e252d5cb8fc5beb4a6..3ba738b2e27117eb4c932143fffedce377919df1 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -20,6 +20,7 @@
 #include <linux/tcp.h>
 #include <linux/mii.h>
 #include <linux/kthread.h>
+#include <linux/slab.h>
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
@@ -537,7 +538,8 @@ static void qeth_send_control_data_cb(struct qeth_channel *channel,
                        dev_err(&card->gdev->dev,
                                "The qeth device is not configured "
                                "for the OSI layer required by z/VM\n");
-               qeth_schedule_recovery(card);
+               else
+                       qeth_schedule_recovery(card);
                goto out;
        }
 
@@ -1113,8 +1115,6 @@ 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;
@@ -3805,9 +3805,6 @@ static int qeth_qdio_establish(struct qeth_card *card)
        init_data.input_handler          = card->discipline.input_handler;
        init_data.output_handler         = card->discipline.output_handler;
        init_data.int_parm               = (unsigned long) card;
-       init_data.flags                  = QDIO_INBOUND_0COPY_SBALS |
-                                          QDIO_OUTBOUND_0COPY_SBALS |
-                                          QDIO_USE_OUTBOUND_PCIS;
        init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
        init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;