qeth: EDDP does not work on large MTUs

Fix filling the qdio buffers in EDDP mode.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 70108fb1690..e3c268cfbff 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -159,13 +159,15 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue,
                 buffer = buf->buffer;
                 /* fill one skb into buffer */
                 for (i = 0; i < ctx->elements_per_skb; ++i){
-                        buffer->element[buf->next_element_to_fill].addr =
-                                ctx->elements[element].addr;
-                        buffer->element[buf->next_element_to_fill].length =
-                                ctx->elements[element].length;
-                        buffer->element[buf->next_element_to_fill].flags =
-                                ctx->elements[element].flags;
-                        buf->next_element_to_fill++;
+                        if (ctx->elements[element].length != 0) {
+                                buffer->element[buf->next_element_to_fill].
+                                addr = ctx->elements[element].addr;
+                                buffer->element[buf->next_element_to_fill].
+                                length = ctx->elements[element].length;
+                                buffer->element[buf->next_element_to_fill].
+                                flags = ctx->elements[element].flags;
+                                buf->next_element_to_fill++;
+                        }
                         element++;
                         elements--;
                 }
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index b41a53816e9..fe6164795ed 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -4508,7 +4508,8 @@ qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
                         /* check if we have enough elements (including following
                          * free buffers) to handle eddp context */
                         if (qeth_eddp_check_buffers_for_context(queue,ctx) < 0){
-                                printk("eddp tx_dropped 1\n");
+                                if (net_ratelimit())
+                                        PRINT_WARN("eddp tx_dropped 1\n");
                                 rc = -EBUSY;
                                 goto out;
                         }