aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_l3_main.c
diff options
context:
space:
mode:
authorFrank Blaschka <frank.blaschka@de.ibm.com>2008-04-24 04:15:25 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-29 01:56:33 -0400
commit8af7c5aebc9a7b46f6ea55ee5a216dce4005f538 (patch)
tree3d6b56222a53c3a4ce626bb88733d3de38324a97 /drivers/s390/net/qeth_l3_main.c
parentf90b744eb8ead0af7a7aa2f78ff861dff4863f2c (diff)
qeth: layer 3 add missing dev_open/close to ccwgroup handler
In case the ccwgroup device is set online/offline we have to run the corresponding dev_open/close for the netdevice. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/s390/net/qeth_l3_main.c')
-rw-r--r--drivers/s390/net/qeth_l3_main.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 50545a1f6b3b..94a8ead64ed4 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2091,6 +2091,11 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
2091 (card->state == CARD_STATE_UP)) { 2091 (card->state == CARD_STATE_UP)) {
2092 if (recovery_mode) 2092 if (recovery_mode)
2093 qeth_l3_stop(card->dev); 2093 qeth_l3_stop(card->dev);
2094 else {
2095 rtnl_lock();
2096 dev_close(card->dev);
2097 rtnl_unlock();
2098 }
2094 if (!card->use_hard_stop) { 2099 if (!card->use_hard_stop) {
2095 rc = qeth_send_stoplan(card); 2100 rc = qeth_send_stoplan(card);
2096 if (rc) 2101 if (rc)
@@ -3135,9 +3140,15 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
3135 netif_carrier_on(card->dev); 3140 netif_carrier_on(card->dev);
3136 3141
3137 qeth_set_allowed_threads(card, 0xffffffff, 0); 3142 qeth_set_allowed_threads(card, 0xffffffff, 0);
3138 if ((recover_flag == CARD_STATE_RECOVER) && recovery_mode) { 3143 if (recover_flag == CARD_STATE_RECOVER) {
3144 if (recovery_mode)
3139 qeth_l3_open(card->dev); 3145 qeth_l3_open(card->dev);
3140 qeth_l3_set_multicast_list(card->dev); 3146 else {
3147 rtnl_lock();
3148 dev_open(card->dev);
3149 rtnl_unlock();
3150 }
3151 qeth_l3_set_multicast_list(card->dev);
3141 } 3152 }
3142 /* let user_space know that device is online */ 3153 /* let user_space know that device is online */
3143 kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE); 3154 kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);