From f57f1a423344818dfeb68baf199c6184199d19f7 Mon Sep 17 00:00:00 2001
From: Ursula Braun <ursula.braun@de.ibm.com>
Date: Wed, 2 Feb 2011 06:04:33 +0000
Subject: [PATCH] --- yaml --- r: 232879 b: refs/heads/master c:
 8b2e18f662939fb3d9b0ffe5da953ba56d259e3a h: refs/heads/master i:   232877:
 00c66e575c364f1063795def33a8f2fb268442ca   232875:
 c2b795c63f260f01179ff13ed4178ec6da3d2932   232871:
 69c68eda19107cdede6b951d1cfa150346d52172   232863:
 54f0845b45dcc4ed72597929be5140c18c830953 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/s390/net/qeth_core_main.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b585db72cff2..d9bcf42b1efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9853b97bccbd2b08ce5fef497f21fa7395f68823
+refs/heads/master: 8b2e18f662939fb3d9b0ffe5da953ba56d259e3a
diff --git a/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c
index ddeef41049ae..eca3e094031a 100644
--- a/trunk/drivers/s390/net/qeth_core_main.c
+++ b/trunk/drivers/s390/net/qeth_core_main.c
@@ -1887,8 +1887,16 @@ static int qeth_ulp_enable_cb(struct qeth_card *card, struct qeth_reply *reply,
 			QETH_DBF_TEXT_(SETUP, 2, "  rc%d", iob->rc);
 			return 0;
 		}
-		card->info.max_mtu = mtu;
+		if (card->info.initial_mtu && (card->info.initial_mtu != mtu)) {
+			/* frame size has changed */
+			if (card->dev &&
+			    ((card->dev->mtu == card->info.initial_mtu) ||
+			     (card->dev->mtu > mtu)))
+				card->dev->mtu = mtu;
+			qeth_free_qdio_buffers(card);
+		}
 		card->info.initial_mtu = mtu;
+		card->info.max_mtu = mtu;
 		card->qdio.in_buf_size = mtu + 2 * PAGE_SIZE;
 	} else {
 		card->info.initial_mtu = qeth_get_initial_mtu_for_card(card);