qeth: avoid qeth recovery problems
Do not touch IFF_UP flag during qeth recovery, but invoke dev_close() in case of failing recovery. Cancel outstanding control commands in case of Data Checks or Channel Checks. Do not invoke qeth_l2_del_all_mc() in case of a hard stop to speed up removal of qeth devices. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
committed by
Jeff Garzik
parent
f1d58672de
commit
28a7e4c906
@@ -2795,7 +2795,6 @@ static int qeth_l3_open(struct net_device *dev)
|
||||
return -ENODEV;
|
||||
card->data.state = CH_STATE_UP;
|
||||
card->state = CARD_STATE_UP;
|
||||
card->dev->flags |= IFF_UP;
|
||||
netif_start_queue(dev);
|
||||
|
||||
if (!card->lan_online && netif_carrier_ok(dev))
|
||||
@@ -2809,7 +2808,6 @@ static int qeth_l3_stop(struct net_device *dev)
|
||||
|
||||
QETH_DBF_TEXT(TRACE, 4, "qethstop");
|
||||
netif_tx_disable(dev);
|
||||
card->dev->flags &= ~IFF_UP;
|
||||
if (card->state == CARD_STATE_UP)
|
||||
card->state = CARD_STATE_SOFTSETUP;
|
||||
return 0;
|
||||
@@ -3218,9 +3216,13 @@ static int qeth_l3_recover(void *ptr)
|
||||
if (!rc)
|
||||
PRINT_INFO("Device %s successfully recovered!\n",
|
||||
CARD_BUS_ID(card));
|
||||
else
|
||||
else {
|
||||
rtnl_lock();
|
||||
dev_close(card->dev);
|
||||
rtnl_unlock();
|
||||
PRINT_INFO("Device %s could not be recovered!\n",
|
||||
CARD_BUS_ID(card));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user