Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
s390
/
net
/
qeth_l3_main.c
diff --git
a/kernel/drivers/s390/net/qeth_l3_main.c
b/kernel/drivers/s390/net/qeth_l3_main.c
index
543960e
..
cc4d3c3
100644
(file)
--- a/
kernel/drivers/s390/net/qeth_l3_main.c
+++ b/
kernel/drivers/s390/net/qeth_l3_main.c
@@
-3220,6
+3220,7
@@
static int qeth_l3_setup_netdev(struct qeth_card *card)
SET_NETDEV_DEV(card->dev, &card->gdev->dev);
netif_napi_add(card->dev, &card->napi, qeth_l3_poll, QETH_NAPI_WEIGHT);
SET_NETDEV_DEV(card->dev, &card->gdev->dev);
netif_napi_add(card->dev, &card->napi, qeth_l3_poll, QETH_NAPI_WEIGHT);
+ netif_carrier_off(card->dev);
return register_netdev(card->dev);
}
return register_netdev(card->dev);
}
@@
-3246,6
+3247,7
@@
static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
qeth_l3_set_offline(cgdev);
if (card->dev) {
qeth_l3_set_offline(cgdev);
if (card->dev) {
+ netif_napi_del(&card->napi);
unregister_netdev(card->dev);
card->dev = NULL;
}
unregister_netdev(card->dev);
card->dev = NULL;
}