p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s390/qeth: re-indent qeth_check_ipa_data() 

Pull one level of checking up into qeth_send_control_data_cb(), and
clean up an else-after-return. No functional change.

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:14 +02:00 committed by David S. Miller
parent 68bba11643
commit d19b93f40e
1 changed files with 60 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,80 +626,64 @@ static void qeth_issue_ipa_msg(struct qeth_ipa_cmd *cmd, int rc,
} }
static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card, static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card,
struct qeth_cmd_buffer *iob) struct qeth_ipa_cmd *cmd)
{ {
struct qeth_ipa_cmd *cmd = NULL;
QETH_CARD_TEXT(card, 5, "chkipad"); QETH_CARD_TEXT(card, 5, "chkipad");
if (IS_IPA(iob->data)) {
cmd = (struct qeth_ipa_cmd *) PDU_ENCAPSULATION(iob->data); if (IS_IPA_REPLY(cmd)) {
if (IS_IPA_REPLY(cmd)) { if (cmd->hdr.command != IPA_CMD_SETCCID &&
if (cmd->hdr.command != IPA_CMD_SETCCID && cmd->hdr.command != IPA_CMD_DELCCID &&
cmd->hdr.command != IPA_CMD_DELCCID && cmd->hdr.command != IPA_CMD_MODCCID &&
cmd->hdr.command != IPA_CMD_MODCCID && cmd->hdr.command != IPA_CMD_SET_DIAG_ASS)
cmd->hdr.command != IPA_CMD_SET_DIAG_ASS) qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
qeth_issue_ipa_msg(cmd, return cmd;
cmd->hdr.return_code, card); }
return cmd;
} else { /* handle unsolicited event: */
switch (cmd->hdr.command) { switch (cmd->hdr.command) {
case IPA_CMD_STOPLAN: case IPA_CMD_STOPLAN:
if (cmd->hdr.return_code == if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
IPA_RC_VEPA_TO_VEB_TRANSITION) { dev_err(&card->gdev->dev,
dev_err(&card->gdev->dev, "Interface %s is down because the adjacent port is no longer in reflective relay mode\n",
"Interface %s is down because the " QETH_CARD_IFNAME(card));
"adjacent port is no longer in " qeth_close_dev(card);
"reflective relay mode\n", } else {
QETH_CARD_IFNAME(card)); dev_warn(&card->gdev->dev,
qeth_close_dev(card); "The link for interface %s on CHPID 0x%X failed\n",
} else { QETH_CARD_IFNAME(card), card->info.chpid);
dev_warn(&card->gdev->dev, qeth_issue_ipa_msg(cmd, cmd->hdr.return_code, card);
"The link for interface %s on CHPID" }
" 0x%X failed\n", card->lan_online = 0;
QETH_CARD_IFNAME(card), netif_carrier_off(card->dev);
card->info.chpid); return NULL;
qeth_issue_ipa_msg(cmd, case IPA_CMD_STARTLAN:
cmd->hdr.return_code, card); dev_info(&card->gdev->dev,
} "The link for %s on CHPID 0x%X has been restored\n",
card->lan_online = 0; QETH_CARD_IFNAME(card), card->info.chpid);
netif_carrier_off(card->dev); netif_carrier_on(card->dev);
return NULL; card->lan_online = 1;
case IPA_CMD_STARTLAN: if (card->info.hwtrap)
dev_info(&card->gdev->dev, card->info.hwtrap = 2;
"The link for %s on CHPID 0x%X has" qeth_schedule_recovery(card);
" been restored\n", return NULL;
QETH_CARD_IFNAME(card), case IPA_CMD_SETBRIDGEPORT_IQD:
card->info.chpid); case IPA_CMD_SETBRIDGEPORT_OSA:
netif_carrier_on(card->dev); case IPA_CMD_ADDRESS_CHANGE_NOTIF:
card->lan_online = 1; if (card->discipline->control_event_handler(card, cmd))
if (card->info.hwtrap) return cmd;
card->info.hwtrap = 2; return NULL;
qeth_schedule_recovery(card); case IPA_CMD_MODCCID:
return NULL; return cmd;
case IPA_CMD_SETBRIDGEPORT_IQD: case IPA_CMD_REGISTER_LOCAL_ADDR:
case IPA_CMD_SETBRIDGEPORT_OSA: QETH_CARD_TEXT(card, 3, "irla");
case IPA_CMD_ADDRESS_CHANGE_NOTIF: return NULL;
if (card->discipline->control_event_handler case IPA_CMD_UNREGISTER_LOCAL_ADDR:
(card, cmd)) QETH_CARD_TEXT(card, 3, "urla");
return cmd; return NULL;
else default:
return NULL; QETH_DBF_MESSAGE(2, "Received data is IPA but not a reply!\n");
case IPA_CMD_MODCCID: return cmd;
return cmd;
case IPA_CMD_REGISTER_LOCAL_ADDR:
QETH_CARD_TEXT(card, 3, "irla");
return NULL;
case IPA_CMD_UNREGISTER_LOCAL_ADDR:
QETH_CARD_TEXT(card, 3, "urla");
return NULL;
default:
QETH_DBF_MESSAGE(2, "Received data is IPA "
"but not a reply!\n");
break;
}
}
} }
return cmd;
} }
void qeth_clear_ipacmd_list(struct qeth_card *card) void qeth_clear_ipacmd_list(struct qeth_card *card)
@ -820,8 +804,8 @@ static void qeth_send_control_data_cb(struct qeth_card *card,
struct qeth_channel *channel, struct qeth_channel *channel,
struct qeth_cmd_buffer *iob) struct qeth_cmd_buffer *iob)
{ {
struct qeth_ipa_cmd *cmd = NULL;
struct qeth_reply *reply, *r; struct qeth_reply *reply, *r;
struct qeth_ipa_cmd *cmd;
unsigned long flags; unsigned long flags;
int keep_reply; int keep_reply;
int rc = 0; int rc = 0;
@ -839,7 +823,10 @@ static void qeth_send_control_data_cb(struct qeth_card *card,
goto out; goto out;
} }
cmd = qeth_check_ipa_data(card, iob); 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 == NULL) && (card->state != CARD_STATE_DOWN))
goto out; goto out;
/*in case of OSN : check if cmd is set */ /*in case of OSN : check if cmd is set */