From 760e9a22f12e8830ef6370f546dee226789e2144 Mon Sep 17 00:00:00 2001 From: Frank Blaschka Date: Thu, 24 Apr 2008 10:15:25 +0200 Subject: [PATCH] --- yaml --- r: 95375 b: refs/heads/master c: 8af7c5aebc9a7b46f6ea55ee5a216dce4005f538 h: refs/heads/master i: 95373: 6b64a2e2709e82827120750b363c19f147ce168f 95371: a516ffac1e7c0446bae5e7c478d763ca1c9483b7 95367: 884a35c751f8360ce503efebb89fefa050b6b5ae 95359: b582bf745a27d8b6045cf18098dd41b07afa38ce v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1022fceb92cd..d3e3b1a36169 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f90b744eb8ead0af7a7aa2f78ff861dff4863f2c +refs/heads/master: 8af7c5aebc9a7b46f6ea55ee5a216dce4005f538 diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c index 50545a1f6b3b..94a8ead64ed4 100644 --- a/trunk/drivers/s390/net/qeth_l3_main.c +++ b/trunk/drivers/s390/net/qeth_l3_main.c @@ -2091,6 +2091,11 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode) (card->state == CARD_STATE_UP)) { if (recovery_mode) qeth_l3_stop(card->dev); + else { + rtnl_lock(); + dev_close(card->dev); + rtnl_unlock(); + } if (!card->use_hard_stop) { rc = qeth_send_stoplan(card); if (rc) @@ -3135,9 +3140,15 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode) netif_carrier_on(card->dev); qeth_set_allowed_threads(card, 0xffffffff, 0); - if ((recover_flag == CARD_STATE_RECOVER) && recovery_mode) { + if (recover_flag == CARD_STATE_RECOVER) { + if (recovery_mode) qeth_l3_open(card->dev); - qeth_l3_set_multicast_list(card->dev); + else { + rtnl_lock(); + dev_open(card->dev); + rtnl_unlock(); + } + qeth_l3_set_multicast_list(card->dev); } /* let user_space know that device is online */ kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);