From: frank.blaschka@de.ibm.com
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
Heiko Carstens <heiko.carstens@de.ibm.com>
Subject: [patch 6/6] [PATCH] qeth: fix wait_event_timeout handling
Date: Wed, 25 Mar 2009 07:57:19 +0100 [thread overview]
Message-ID: <20090325065809.349207000@de.ibm.com> (raw)
In-Reply-To: 20090325065713.054133000@de.ibm.com
[-- Attachment #1: 620-qeth-wait-event.diff --]
[-- Type: text/plain, Size: 1691 bytes --]
From: Heiko Carstens <heiko.carstens@de.ibm.com>
wait_event_timeout just takes the numnber of jiffies to wait as
an argument. That value does not include jiffies itself.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
Index: git_linus/drivers/s390/net/qeth_core_main.c
===================================================================
--- git_linus.orig/drivers/s390/net/qeth_core_main.c
+++ git_linus/drivers/s390/net/qeth_core_main.c
@@ -1676,7 +1676,7 @@ int qeth_send_control_data(struct qeth_c
int rc;
unsigned long flags;
struct qeth_reply *reply = NULL;
- unsigned long timeout;
+ unsigned long timeout, event_timeout;
struct qeth_ipa_cmd *cmd;
QETH_DBF_TEXT(TRACE, 2, "sendctl");
@@ -1701,9 +1701,10 @@ int qeth_send_control_data(struct qeth_c
qeth_prepare_control_data(card, len, iob);
if (IS_IPA(iob->data))
- timeout = jiffies + QETH_IPA_TIMEOUT;
+ event_timeout = QETH_IPA_TIMEOUT;
else
- timeout = jiffies + QETH_TIMEOUT;
+ event_timeout = QETH_TIMEOUT;
+ timeout = jiffies + event_timeout;
QETH_DBF_TEXT(TRACE, 6, "noirqpnd");
spin_lock_irqsave(get_ccwdev_lock(card->write.ccwdev), flags);
@@ -1731,7 +1732,7 @@ int qeth_send_control_data(struct qeth_c
if ((cmd->hdr.command == IPA_CMD_SETIP) &&
(cmd->hdr.prot_version == QETH_PROT_IPV4)) {
if (!wait_event_timeout(reply->wait_q,
- atomic_read(&reply->received), timeout))
+ atomic_read(&reply->received), event_timeout))
goto time_err;
} else {
while (!atomic_read(&reply->received)) {
next prev parent reply other threads:[~2009-03-25 6:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-25 6:57 [patch 0/6] s390: qeth fixes for 2.6.30 frank.blaschka
2009-03-25 6:57 ` [patch 1/6] [PATCH] qeth: struct device - replace bus_id with dev_name(), dev_set_name() frank.blaschka
2009-03-25 6:57 ` [patch 2/6] [PATCH] qeth: add statistics for tx csum frank.blaschka
2009-03-25 6:57 ` [patch 3/6] [PATCH] qeth: remove EDDP frank.blaschka
2009-03-25 6:57 ` [patch 4/6] [PATCH] qeth: unregister MAC addresses during recovery frank.blaschka
2009-03-25 6:57 ` [patch 5/6] [PATCH] qeth: check for completion of a running recovery frank.blaschka
2009-03-25 6:57 ` frank.blaschka [this message]
2009-03-25 7:08 ` [patch 0/6] s390: qeth fixes for 2.6.30 David Miller
2009-03-25 8:25 ` Frank Blaschka
2009-03-25 23:47 ` David Miller
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=20090325065809.349207000@de.ibm.com \
--to=frank.blaschka@de.ibm.com \
--cc=davem@davemloft.net \
--cc=heiko.carstens@de.ibm.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).