diff options
| author |   Julian Wiedmann <jwi@linux.ibm.com> | 2020-09-23 10:36:58 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-09-23 12:07:54 -0700 |
| commit | b7ea041b2e506b17cb5ec6cbd283e6fbc83c8827 (patch) | |
| tree | 965f8ce40e888556595b778ad67c72baa7e91b8c /drivers/s390/net/qeth_l3_main.c | |
| parent | s390/qeth: cancel cmds earlier during teardown (diff) | |
| download | linux-dev-b7ea041b2e506b17cb5ec6cbd283e6fbc83c8827.tar.xz linux-dev-b7ea041b2e506b17cb5ec6cbd283e6fbc83c8827.zip | |
s390/qeth: consolidate online code
Move duplicated code from the disciplines into the core path.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/s390/net/qeth_l3_main.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index 410c35ca8f4a..08285af6a5ff 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c @@ -2012,21 +2012,10 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev) qeth_l3_clear_ipato_list(card); } -static int qeth_l3_set_online(struct qeth_card *card) +static int qeth_l3_set_online(struct qeth_card *card, bool carrier_ok) { - struct ccwgroup_device *gdev = card->gdev; struct net_device *dev = card->dev; int rc = 0; - bool carrier_ok; - - rc = qeth_core_hardsetup_card(card, &carrier_ok); - if (rc) { - QETH_CARD_TEXT_(card, 2, "2err%04x", rc); - rc = -ENODEV; - goto out_remove; - } - - qeth_print_status_message(card); /* softsetup */ QETH_CARD_TEXT(card, 2, "softsetp"); @@ -2073,16 +2062,10 @@ static int qeth_l3_set_online(struct qeth_card *card) } rtnl_unlock(); } - qeth_trace_features(card); - /* let user_space know that device is online */ - kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE); return 0; + out_remove: qeth_l3_stop_card(card); - qeth_stop_channel(&card->data); - qeth_stop_channel(&card->write); - qeth_stop_channel(&card->read); - qdio_free(CARD_DDEV(card)); return rc; } |