s390/qeth: get vnicc sub-cmd type from reply data

When processing the reply for a vnicc cmd, there's no need to remember
which specific sub-cmd type we initially sent. The reply itself contains
all the needed information.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index ad7ee3bfd63ca605847cf69baeda8ec9e6600149..1f534f489a79781d92c4020ab968f5b8b830cda0 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1704,7 +1704,6 @@ static int qeth_l2_vnicc_makerc(struct qeth_card *card, u16 ipa_rc)
 
 /* generic VNICC request call back control */
 struct _qeth_l2_vnicc_request_cbctl {
-       u32 sub_cmd;
        struct {
                union{
                        u32 *sup_cmds;
@@ -1722,6 +1721,7 @@ static int qeth_l2_vnicc_request_cb(struct qeth_card *card,
                (struct _qeth_l2_vnicc_request_cbctl *) reply->param;
        struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *) data;
        struct qeth_ipacmd_vnicc *rep = &cmd->data.vnicc;
+       u32 sub_cmd = cmd->data.vnicc.hdr.sub_command;
 
        QETH_CARD_TEXT(card, 2, "vniccrcb");
        if (cmd->hdr.return_code)
@@ -1730,10 +1730,9 @@ static int qeth_l2_vnicc_request_cb(struct qeth_card *card,
        card->options.vnicc.sup_chars = rep->vnicc_cmds.supported;
        card->options.vnicc.cur_chars = rep->vnicc_cmds.enabled;
 
-       if (cbctl->sub_cmd == IPA_VNICC_QUERY_CMDS)
+       if (sub_cmd == IPA_VNICC_QUERY_CMDS)
                *cbctl->result.sup_cmds = rep->data.query_cmds.sup_cmds;
-
-       if (cbctl->sub_cmd == IPA_VNICC_GET_TIMEOUT)
+       else if (sub_cmd == IPA_VNICC_GET_TIMEOUT)
                *cbctl->result.timeout = rep->data.getset_timeout.timeout;
 
        return 0;
@@ -1761,7 +1760,6 @@ static struct qeth_cmd_buffer *qeth_l2_vnicc_build_cmd(struct qeth_card *card,
 /* VNICC query VNIC characteristics request */
 static int qeth_l2_vnicc_query_chars(struct qeth_card *card)
 {
-       struct _qeth_l2_vnicc_request_cbctl cbctl;
        struct qeth_cmd_buffer *iob;
 
        QETH_CARD_TEXT(card, 2, "vniccqch");
@@ -1769,10 +1767,7 @@ static int qeth_l2_vnicc_query_chars(struct qeth_card *card)
        if (!iob)
                return -ENOMEM;
 
-       /* prepare callback control */
-       cbctl.sub_cmd = IPA_VNICC_QUERY_CHARS;
-
-       return qeth_send_ipa_cmd(card, iob, qeth_l2_vnicc_request_cb, &cbctl);
+       return qeth_send_ipa_cmd(card, iob, qeth_l2_vnicc_request_cb, NULL);
 }
 
 /* VNICC query sub commands request */
@@ -1791,7 +1786,6 @@ static int qeth_l2_vnicc_query_cmds(struct qeth_card *card, u32 vnic_char,
        __ipa_cmd(iob)->data.vnicc.data.query_cmds.vnic_char = vnic_char;
 
        /* prepare callback control */
-       cbctl.sub_cmd = IPA_VNICC_QUERY_CMDS;
        cbctl.result.sup_cmds = sup_cmds;
 
        return qeth_send_ipa_cmd(card, iob, qeth_l2_vnicc_request_cb, &cbctl);
@@ -1801,7 +1795,6 @@ static int qeth_l2_vnicc_query_cmds(struct qeth_card *card, u32 vnic_char,
 static int qeth_l2_vnicc_set_char(struct qeth_card *card, u32 vnic_char,
                                      u32 cmd)
 {
-       struct _qeth_l2_vnicc_request_cbctl cbctl;
        struct qeth_cmd_buffer *iob;
 
        QETH_CARD_TEXT(card, 2, "vniccedc");
@@ -1811,10 +1804,7 @@ static int qeth_l2_vnicc_set_char(struct qeth_card *card, u32 vnic_char,
 
        __ipa_cmd(iob)->data.vnicc.data.set_char.vnic_char = vnic_char;
 
-       /* prepare callback control */
-       cbctl.sub_cmd = cmd;
-
-       return qeth_send_ipa_cmd(card, iob, qeth_l2_vnicc_request_cb, &cbctl);
+       return qeth_send_ipa_cmd(card, iob, qeth_l2_vnicc_request_cb, NULL);
 }
 
 /* VNICC get/set timeout for characteristic request */
@@ -1838,7 +1828,6 @@ static int qeth_l2_vnicc_getset_timeout(struct qeth_card *card, u32 vnicc,
                getset_timeout->timeout = *timeout;
 
        /* prepare callback control */
-       cbctl.sub_cmd = cmd;
        if (cmd == IPA_VNICC_GET_TIMEOUT)
                cbctl.result.timeout = timeout;