leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/qeth: clean up drop conditions for received cmds

Browse Source 
If qeth_check_ipa_data() consumed an event, there's no point in
processing it further. So drop it early, and make the surrounding code
a tiny bit more readable.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2018-09-26 18:29:15 +02:00 committed by David S. Miller
parent d19b93f40e
commit d782d80f36
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/s390/net/qeth_core_main.c
View File

@ -826,16 +826,17 @@ static void qeth_send_control_data_cb(struct qeth_card *card,
if (IS_IPA(iob->data)) { if (IS_IPA(iob->data)) {
cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data); cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);
cmd = qeth_check_ipa_data(card, cmd); cmd = qeth_check_ipa_data(card, cmd);
} if (!cmd)
if ((cmd == NULL) && (card->state != CARD_STATE_DOWN)) goto out;
goto out; if (IS_OSN(card) && card->osn_info.assist_cb &&
/*in case of OSN : check if cmd is set */ cmd->hdr.command != IPA_CMD_STARTLAN) {
if (card->info.type == QETH_CARD_TYPE_OSN && card->osn_info.assist_cb(card->dev, cmd);
cmd && goto out;
cmd->hdr.command != IPA_CMD_STARTLAN && }
card->osn_info.assist_cb != NULL) { } else {
card->osn_info.assist_cb(card->dev, cmd); /* non-IPA commands should only flow during initialization */
goto out; if (card->state != CARD_STATE_DOWN)
goto out;
} }
spin_lock_irqsave(&card->lock, flags); spin_lock_irqsave(&card->lock, flags);