Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d782d80f authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: clean up drop conditions for received cmds 



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: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d19b93f4

drivers/s390/net/qeth_core_main.c

+11 −10
Original line number Diff line number Diff line
@@ -826,17 +826,18 @@ static void qeth_send_control_data_cb(struct qeth_card *card, 
	if (IS_IPA(iob->data)) {

		cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data);

		cmd = qeth_check_ipa_data(card, cmd);

	}

	if ((cmd == NULL) && (card->state != CARD_STATE_DOWN))

		if (!cmd)

			goto out;

	/*in case of OSN : check if cmd is set */

	if (card->info.type == QETH_CARD_TYPE_OSN &&

	    cmd &&

	    cmd->hdr.command != IPA_CMD_STARTLAN &&

	    card->osn_info.assist_cb != NULL) {

		if (IS_OSN(card) && card->osn_info.assist_cb &&

		    cmd->hdr.command != IPA_CMD_STARTLAN) {

			card->osn_info.assist_cb(card->dev, cmd);

			goto out;

		}

	} else {

		/* non-IPA commands should only flow during initialization */

		if (card->state != CARD_STATE_DOWN)

			goto out;

	}



	spin_lock_irqsave(&card->lock, flags);

	list_for_each_entry_safe(reply, r, &card->cmd_waiter_list, list) {