From: frank.blaschka@de.ibm.com
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
Ursula Braun <ursula.braun@de.ibm.com>
Subject: [patch 6/8] [PATCH] qeth: return zero from reply callback functions
Date: Fri, 23 Jul 2010 11:15:08 +0200 [thread overview]
Message-ID: <20100723091550.425248000@de.ibm.com> (raw)
In-Reply-To: 20100723091502.678949000@de.ibm.com
[-- Attachment #1: 617-qeth-reply-callback.diff --]
[-- Type: text/plain, Size: 2500 bytes --]
From: Ursula Braun <ursula.braun@de.ibm.com>
Reply callback functions in qeth should return zero if command
response consists of one part only, otherwise qeth continues
waiting for further parts of the command response.
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
drivers/s390/net/qeth_core_main.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2010-07-22 10:22:36.000000000 +0200
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2010-07-22 10:22:36.000000000 +0200
@@ -1996,7 +1996,7 @@ static int qeth_ulp_setup_cb(struct qeth
QETH_DBF_TEXT(SETUP, 2, "olmlimit");
dev_err(&card->gdev->dev, "A connection could not be "
"established because of an OLM limit\n");
- rc = -EMLINK;
+ iob->rc = -EMLINK;
}
QETH_DBF_TEXT_(SETUP, 2, " rc%d", iob->rc);
return rc;
@@ -3423,7 +3423,6 @@ static int qeth_setadpparms_set_access_c
{
struct qeth_ipa_cmd *cmd;
struct qeth_set_access_ctrl *access_ctrl_req;
- int rc;
QETH_CARD_TEXT(card, 4, "setaccb");
@@ -3450,7 +3449,6 @@ static int qeth_setadpparms_set_access_c
card->gdev->dev.kobj.name,
access_ctrl_req->subcmd_code,
cmd->data.setadapterparms.hdr.return_code);
- rc = 0;
break;
}
case SET_ACCESS_CTRL_RC_NOT_SUPPORTED:
@@ -3464,7 +3462,6 @@ static int qeth_setadpparms_set_access_c
/* ensure isolation mode is "none" */
card->options.isolation = ISOLATION_MODE_NONE;
- rc = -EOPNOTSUPP;
break;
}
case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER:
@@ -3479,7 +3476,6 @@ static int qeth_setadpparms_set_access_c
/* ensure isolation mode is "none" */
card->options.isolation = ISOLATION_MODE_NONE;
- rc = -EOPNOTSUPP;
break;
}
case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF:
@@ -3493,7 +3489,6 @@ static int qeth_setadpparms_set_access_c
/* ensure isolation mode is "none" */
card->options.isolation = ISOLATION_MODE_NONE;
- rc = -EPERM;
break;
}
default:
@@ -3507,12 +3502,11 @@ static int qeth_setadpparms_set_access_c
/* ensure isolation mode is "none" */
card->options.isolation = ISOLATION_MODE_NONE;
- rc = 0;
break;
}
}
qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
- return rc;
+ return 0;
}
static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,
next prev parent reply other threads:[~2010-07-23 9:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 9:15 [patch 0/8] s390: qeth some more patches for 2.6.36 frank.blaschka
2010-07-23 9:15 ` [patch 1/8] [PATCH] qeth: IP address takeover flag setting frank.blaschka
2010-07-23 9:15 ` [patch 2/8] qeth: Clear mac_bits field when switching between Layer 2 and Layer 3 frank.blaschka
2010-07-23 9:15 ` [patch 3/8] [PATCH] qeth: serialize sysfs-triggered device configurations frank.blaschka
2010-07-23 9:15 ` [patch 4/8] [PATCH] qeth: avoid loop if ipa command response is missing frank.blaschka
2010-07-23 9:15 ` [patch 5/8] [PATCH] claw: A claw device is a group of just 2 ccw devices frank.blaschka
2010-07-23 9:15 ` frank.blaschka [this message]
2010-07-23 9:15 ` [patch 7/8] [PATCH] qeth: Use memdup_user when user data is immediately copied into the allocated region frank.blaschka
2010-07-23 9:15 ` [patch 8/8] [PATCH] qeth: avoid useless removal of multicast addresses frank.blaschka
2010-07-23 19:36 ` [patch 0/8] s390: qeth some more patches for 2.6.36 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=20100723091550.425248000@de.ibm.com \
--to=frank.blaschka@de.ibm.com \
--cc=davem@davemloft.net \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ursula.braun@de.ibm.com \
/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).