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

Commit a959189a authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: set promisc off after trace disabling failure 



If HiperSockets Network Traffic Analyzer is switched off, but trace
disabling fails somehow, the qeth driver does not switch off its
promisc mode status. A following sniffer reactivation fails, since
qeth does not see a need to reenable tracing.
At the same time the code analyzing results of trace commands is
restructured.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21fde749

drivers/s390/net/qeth_l3_main.c

+30 −26
Original line number Diff line number Diff line
@@ -1691,14 +1691,34 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply, 


	cmd = (struct qeth_ipa_cmd *)data;

	rc = cmd->hdr.return_code;

	if (rc) {

	if (rc)

		QETH_DBF_TEXT_(TRACE, 2, "dxter%x", rc);

		if (cmd->data.diagass.action == QETH_DIAGS_CMD_TRACE_ENABLE) {

	switch (cmd->data.diagass.action) {

	case QETH_DIAGS_CMD_TRACE_QUERY:

		break;

	case QETH_DIAGS_CMD_TRACE_DISABLE:

		switch (rc) {

		case 0:

		case IPA_RC_INVALID_SUBCMD:

			card->info.promisc_mode = SET_PROMISC_MODE_OFF;

			dev_info(&card->gdev->dev, "The HiperSockets network "

				"traffic analyzer is deactivated\n");

			break;

		default:

			break;

		}

		break;

	case QETH_DIAGS_CMD_TRACE_ENABLE:

		switch (rc) {

		case 0:

			card->info.promisc_mode = SET_PROMISC_MODE_ON;

			dev_info(&card->gdev->dev, "The HiperSockets network "

				"traffic analyzer is activated\n");

			break;

		case IPA_RC_HARDWARE_AUTH_ERROR:

			dev_warn(&card->gdev->dev, "The device is not "

					"authorized to run as a HiperSockets "

					"network traffic analyzer\n");

				"authorized to run as a HiperSockets network "

				"traffic analyzer\n");

			break;

		case IPA_RC_TRACE_ALREADY_ACTIVE:

			dev_warn(&card->gdev->dev, "A HiperSockets "
@@ -1708,22 +1728,6 @@ qeth_diags_trace_cb(struct qeth_card *card, struct qeth_reply *reply, 
		default:

			break;

		}

		}

		return 0;

	}



	switch (cmd->data.diagass.action) {

	case QETH_DIAGS_CMD_TRACE_QUERY:

		break;

	case QETH_DIAGS_CMD_TRACE_DISABLE:

		card->info.promisc_mode = SET_PROMISC_MODE_OFF;

		dev_info(&card->gdev->dev, "The HiperSockets network traffic "

			"analyzer is deactivated\n");

		break;

	case QETH_DIAGS_CMD_TRACE_ENABLE:

		card->info.promisc_mode = SET_PROMISC_MODE_ON;

		dev_info(&card->gdev->dev, "The HiperSockets network traffic "

			"analyzer is activated\n");

		break;

	default:

		QETH_DBF_MESSAGE(2, "Unknown sniffer action (0x%04x) on %s\n",