diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-28 11:17:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-28 11:17:26 +1000 |
| commit | 6c15060e5591709886567081ef07eaed4ce36b0c (patch) | |
| tree | add2d6d1a1cd07c26d4c90f6af48655958b38062 /drivers/s390/net/qeth_core_main.c | |
| parent | 07462d9ea3c7737ffeb24629f64d3a43f8ea3278 (diff) | |
| parent | a2a804cddfe65f18f903985e8a8d04c7c9eec354 (diff) | |
Merge commit 'net/master'
Conflicts:
include/linux/mmc/sdio_ids.h
Diffstat (limited to 'drivers/s390/net/qeth_core_main.c')
| -rw-r--r-- | drivers/s390/net/qeth_core_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index c827d69b5a91..2994aa1ed466 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -952,6 +952,7 @@ static void qeth_clear_output_buffer(struct qeth_qdio_out_q *queue, buf->buffer->element[i].addr = NULL; buf->buffer->element[i].flags = 0; } + buf->buffer->element[15].flags = 0; buf->next_element_to_fill = 0; atomic_set(&buf->state, QETH_QDIO_BUF_EMPTY); } @@ -1140,6 +1141,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; |