Commit 1cfef80d authored by Alexandra Winter's avatar Alexandra Winter Committed by David S. Miller

s390/qeth: Don't call dev_close/dev_open (DOWN/UP)

dev_close() and dev_open() are issued to change the interface state to DOWN
or UP (dev->flags IFF_UP). When the netdev is set DOWN it loses e.g its
Ipv6 addresses and routes. We don't want this in cases of device recovery
(triggered by hardware or software) or when the qeth device is set
offline.

Setting a qeth device offline or online and device recovery actions call
netif_device_detach() and/or netif_device_attach(). That will reset or
set the LOWER_UP indication i.e. change the dev->state Bit
__LINK_STATE_PRESENT. That is enough to e.g. cause bond failovers, and
still preserves the interface settings that are handled by the network
stack.

Don't call dev_open() nor dev_close() from the qeth device driver. Let the
network stack handle this.

Fixes: d4560150 ("s390/qeth: call dev_close() during recovery")
Signed-off-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Reviewed-by: default avatarWenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 666c135b
...@@ -716,7 +716,6 @@ struct qeth_card_info { ...@@ -716,7 +716,6 @@ struct qeth_card_info {
u16 chid; u16 chid;
u8 ids_valid:1; /* cssid,iid,chid */ u8 ids_valid:1; /* cssid,iid,chid */
u8 dev_addr_is_registered:1; u8 dev_addr_is_registered:1;
u8 open_when_online:1;
u8 promisc_mode:1; u8 promisc_mode:1;
u8 use_v1_blkt:1; u8 use_v1_blkt:1;
u8 is_vm_nic:1; u8 is_vm_nic:1;
......
...@@ -5373,8 +5373,6 @@ int qeth_set_offline(struct qeth_card *card, const struct qeth_discipline *disc, ...@@ -5373,8 +5373,6 @@ int qeth_set_offline(struct qeth_card *card, const struct qeth_discipline *disc,
qeth_clear_ipacmd_list(card); qeth_clear_ipacmd_list(card);
rtnl_lock(); rtnl_lock();
card->info.open_when_online = card->dev->flags & IFF_UP;
dev_close(card->dev);
netif_device_detach(card->dev); netif_device_detach(card->dev);
netif_carrier_off(card->dev); netif_carrier_off(card->dev);
rtnl_unlock(); rtnl_unlock();
......
...@@ -2388,9 +2388,12 @@ static int qeth_l2_set_online(struct qeth_card *card, bool carrier_ok) ...@@ -2388,9 +2388,12 @@ static int qeth_l2_set_online(struct qeth_card *card, bool carrier_ok)
qeth_enable_hw_features(dev); qeth_enable_hw_features(dev);
qeth_l2_enable_brport_features(card); qeth_l2_enable_brport_features(card);
if (card->info.open_when_online) { if (netif_running(dev)) {
card->info.open_when_online = 0; local_bh_disable();
dev_open(dev, NULL); napi_schedule(&card->napi);
/* kick-start the NAPI softirq: */
local_bh_enable();
qeth_l2_set_rx_mode(dev);
} }
rtnl_unlock(); rtnl_unlock();
} }
......
...@@ -2018,9 +2018,11 @@ static int qeth_l3_set_online(struct qeth_card *card, bool carrier_ok) ...@@ -2018,9 +2018,11 @@ static int qeth_l3_set_online(struct qeth_card *card, bool carrier_ok)
netif_device_attach(dev); netif_device_attach(dev);
qeth_enable_hw_features(dev); qeth_enable_hw_features(dev);
if (card->info.open_when_online) { if (netif_running(dev)) {
card->info.open_when_online = 0; local_bh_disable();
dev_open(dev, NULL); napi_schedule(&card->napi);
/* kick-start the NAPI softirq: */
local_bh_enable();
} }
rtnl_unlock(); rtnl_unlock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment