From: frank.blaschka@de.ibm.com
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
Ursula Braun <braunu@de.ibm.com>
Subject: [patch 09/11] qeth: read number of ports from card
Date: Thu, 24 Apr 2008 10:15:26 +0200 [thread overview]
Message-ID: <20080424081907.955412000@de.ibm.com> (raw)
In-Reply-To: 20080424081517.987104000@de.ibm.com
[-- Attachment #1: 708-qeth-leftover.diff --]
[-- Type: text/plain, Size: 1505 bytes --]
From: Ursula Braun <braunu@de.ibm.com>
Read out number of ports from the hardware.
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 5 +++--
include/asm-s390/qdio.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
Index: git_linus/drivers/s390/net/qeth_core_main.c
===================================================================
--- git_linus.orig/drivers/s390/net/qeth_core_main.c 2008-04-24 08:51:11.000000000 +0200
+++ git_linus/drivers/s390/net/qeth_core_main.c 2008-04-24 08:55:40.000000000 +0200
@@ -3803,8 +3803,9 @@
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);
Index: git_linus/include/asm-s390/qdio.h
===================================================================
--- git_linus.orig/include/asm-s390/qdio.h 2008-04-23 14:56:16.000000000 +0200
+++ git_linus/include/asm-s390/qdio.h 2008-04-24 08:53:24.000000000 +0200
@@ -127,6 +127,7 @@
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);
--
next prev parent reply other threads:[~2008-04-24 8:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-24 8:15 [patch 00/11] s390: network device driver fixes for 2.6.26 frank.blaschka
2008-04-24 8:15 ` [patch 01/11] lcs: CCL-sequ. numbers required for protocol 802.2 only frank.blaschka
2008-04-29 5:59 ` Jeff Garzik
2008-04-24 8:15 ` [patch 02/11] netiucv: get rid of in_atomic() use frank.blaschka
2008-04-24 8:15 ` [patch 03/11] ccwgroup: Unify parsing for group attribute frank.blaschka
2008-04-24 8:15 ` [patch 04/11] qeth module size reduction frank.blaschka
2008-04-24 8:15 ` [patch 05/11] qeth: layer 3 support vlan IPv6 on hiper socket frank.blaschka
2008-04-24 8:15 ` [patch 06/11] qeth: provide get ethtool settings frank.blaschka
2008-04-24 8:15 ` [patch 07/11] qeth: rework fast path frank.blaschka
2008-04-24 8:15 ` [patch 08/11] qeth: layer 3 add missing dev_open/close to ccwgroup handler frank.blaschka
2008-04-24 8:15 ` frank.blaschka [this message]
2008-04-24 8:15 ` [patch 10/11] qeth: layer 2 allow ethtool to set TSO frank.blaschka
2008-04-24 8:15 ` [patch 11/11] netiucv: Fix missing driver attributes frank.blaschka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080424081907.955412000@de.ibm.com \
--to=frank.blaschka@de.ibm.com \
--cc=braunu@de.ibm.com \
--cc=jgarzik@pobox.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).