aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorUrsula Braun <ursula.braun@de.ibm.com>2010-07-22 19:15:08 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-23 15:36:24 -0400
commitbbb822a8c032813148888fcec85e89edb17286d3 (patch)
tree5d1636621e44a3bc17b18dde1c6a741ba4d5b610 /drivers/s390/net
parente48d24a6e31556d62bb903a0deea3a4c15900938 (diff)
qeth: return zero from reply callback functions
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_core_main.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 7f3ea77551e3..6d51494a7f29 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -1996,7 +1996,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply,
1996 QETH_DBF_TEXT(SETUP, 2, "olmlimit"); 1996 QETH_DBF_TEXT(SETUP, 2, "olmlimit");
1997 dev_err(&card->gdev->dev, "A connection could not be " 1997 dev_err(&card->gdev->dev, "A connection could not be "
1998 "established because of an OLM limit\n"); 1998 "established because of an OLM limit\n");
1999 rc = -EMLINK; 1999 iob->rc = -EMLINK;
2000 } 2000 }
2001 QETH_DBF_TEXT_(SETUP, 2, " rc%d", iob->rc); 2001 QETH_DBF_TEXT_(SETUP, 2, " rc%d", iob->rc);
2002 return rc; 2002 return rc;
@@ -3423,7 +3423,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3423{ 3423{
3424 struct qeth_ipa_cmd *cmd; 3424 struct qeth_ipa_cmd *cmd;
3425 struct qeth_set_access_ctrl *access_ctrl_req; 3425 struct qeth_set_access_ctrl *access_ctrl_req;
3426 int rc;
3427 3426
3428 QETH_CARD_TEXT(card, 4, "setaccb"); 3427 QETH_CARD_TEXT(card, 4, "setaccb");
3429 3428
@@ -3450,7 +3449,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3450 card->gdev->dev.kobj.name, 3449 card->gdev->dev.kobj.name,
3451 access_ctrl_req->subcmd_code, 3450 access_ctrl_req->subcmd_code,
3452 cmd->data.setadapterparms.hdr.return_code); 3451 cmd->data.setadapterparms.hdr.return_code);
3453 rc = 0;
3454 break; 3452 break;
3455 } 3453 }
3456 case SET_ACCESS_CTRL_RC_NOT_SUPPORTED: 3454 case SET_ACCESS_CTRL_RC_NOT_SUPPORTED:
@@ -3464,7 +3462,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3464 3462
3465 /* ensure isolation mode is "none" */ 3463 /* ensure isolation mode is "none" */
3466 card->options.isolation = ISOLATION_MODE_NONE; 3464 card->options.isolation = ISOLATION_MODE_NONE;
3467 rc = -EOPNOTSUPP;
3468 break; 3465 break;
3469 } 3466 }
3470 case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER: 3467 case SET_ACCESS_CTRL_RC_NONE_SHARED_ADAPTER:
@@ -3479,7 +3476,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3479 3476
3480 /* ensure isolation mode is "none" */ 3477 /* ensure isolation mode is "none" */
3481 card->options.isolation = ISOLATION_MODE_NONE; 3478 card->options.isolation = ISOLATION_MODE_NONE;
3482 rc = -EOPNOTSUPP;
3483 break; 3479 break;
3484 } 3480 }
3485 case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF: 3481 case SET_ACCESS_CTRL_RC_ACTIVE_CHECKSUM_OFF:
@@ -3493,7 +3489,6 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3493 3489
3494 /* ensure isolation mode is "none" */ 3490 /* ensure isolation mode is "none" */
3495 card->options.isolation = ISOLATION_MODE_NONE; 3491 card->options.isolation = ISOLATION_MODE_NONE;
3496 rc = -EPERM;
3497 break; 3492 break;
3498 } 3493 }
3499 default: 3494 default:
@@ -3507,12 +3502,11 @@ static int qeth_setadpparms_set_access_ctrl_cb(struct qeth_card *card,
3507 3502
3508 /* ensure isolation mode is "none" */ 3503 /* ensure isolation mode is "none" */
3509 card->options.isolation = ISOLATION_MODE_NONE; 3504 card->options.isolation = ISOLATION_MODE_NONE;
3510 rc = 0;
3511 break; 3505 break;
3512 } 3506 }
3513 } 3507 }
3514 qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd); 3508 qeth_default_setadapterparms_cb(card, reply, (unsigned long) cmd);
3515 return rc; 3509 return 0;
3516} 3510}
3517 3511
3518static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card, 3512static int qeth_setadpparms_set_access_ctrl(struct qeth_card *card,