From f7b42a1d0c0bbb6e13ab84967065f175d4b096f1 Mon Sep 17 00:00:00 2001
From: Ursula Braun <braunu@de.ibm.com>
Date: Thu, 24 Apr 2008 10:15:26 +0200
Subject: [PATCH] --- yaml --- r: 95376 b: refs/heads/master c:
 a74b08c7fcfc49727cb9e4409ec0410674410c93 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/s390/net/qeth_core_main.c | 5 +++--
 trunk/include/asm-s390/qdio.h           | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d3e3b1a36169..3b4ed3b17cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8af7c5aebc9a7b46f6ea55ee5a216dce4005f538
+refs/heads/master: a74b08c7fcfc49727cb9e4409ec0410674410c93
diff --git a/trunk/drivers/s390/net/qeth_core_main.c b/trunk/drivers/s390/net/qeth_core_main.c
index 820c332096e2..436bf1f6d4a6 100644
--- a/trunk/drivers/s390/net/qeth_core_main.c
+++ b/trunk/drivers/s390/net/qeth_core_main.c
@@ -3803,8 +3803,9 @@ int qeth_core_hardsetup_card(struct qeth_card *card)
 		QETH_DBF_TEXT_(SETUP, 2, "2err%d", rc);
 		return rc;
 	}
-
-	mpno = QETH_MAX_PORTNO;
+	mpno = qdio_get_ssqd_pct(CARD_DDEV(card));
+	if (mpno)
+		mpno = min(mpno - 1, QETH_MAX_PORTNO);
 	if (card->info.portno > mpno) {
 		PRINT_ERR("Device %s does not offer port number %d \n.",
 			CARD_BUS_ID(card), card->info.portno);
diff --git a/trunk/include/asm-s390/qdio.h b/trunk/include/asm-s390/qdio.h
index 4b8ff55f680e..11240342a0f4 100644
--- a/trunk/include/asm-s390/qdio.h
+++ b/trunk/include/asm-s390/qdio.h
@@ -127,6 +127,7 @@ extern int do_QDIO(struct ccw_device*, unsigned int flags,
 		   unsigned int qidx,unsigned int count,
 		   struct qdio_buffer *buffers);
 
+extern int qdio_get_ssqd_pct(struct ccw_device*);
 extern int qdio_synchronize(struct ccw_device*, unsigned int flags,
 			    unsigned int queue_number);