qeth: return zero from reply callback functions
authorUrsula Braun <ursula.braun@de.ibm.com>
Thu, 22 Jul 2010 23:15:08 +0000 (23:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Jul 2010 19:36:24 +0000 (12:36 -0700)
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>
drivers/s390/net/qeth_core_main.c

index 7f3ea77551e3e1d5b641e7a4f2150747a34bc34f..6d51494a7f29d1290a9171d35180b85c991ee3a1 100644 (file)
@@ -1996,7 +1996,7 @@ static int qeth_ulp_setup_cb(struct qeth_card *card, struct qeth_reply *reply,
                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_ctrl_cb(struct qeth_card *card,
 {
        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_ctrl_cb(struct qeth_card *card,
                        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_ctrl_cb(struct qeth_card *card,
 
                /* 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_ctrl_cb(struct qeth_card *card,
 
                /* 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_ctrl_cb(struct qeth_card *card,
 
                /* 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_ctrl_cb(struct qeth_card *card,
 
                /* 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,