diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-09-21 20:02:27 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-21 20:02:28 -0700 |
commit | b52d3161c23f8944a4050874d3556c8ed148927f (patch) | |
tree | 7e5fe772eed361a7afc9e9f0accc14e1e8a05841 /drivers/s390/net/qeth_core.h | |
parent | b3f98404bd629a243c0a15a3ade32b1cf9fbe0da (diff) | |
parent | d2b59bd4b06d84a4eadb520b0f71c62fe8ec0a62 (diff) |
Merge branch 's390-qeth-fixes-2021-09-21'
Julian Wiedmann says:
====================
s390/qeth: fixes 2021-09-21
This brings two fixes for deadlocks when a device is removed while it
has certain types of async work pending. And one additional fix for a
missing NULL check in an error case.
====================
Link: https://lore.kernel.org/r/20210921145217.1584654-1-jwi@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/s390/net/qeth_core.h')
-rw-r--r-- | drivers/s390/net/qeth_core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 535a60b3946d..a5aa0bdc61d6 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h @@ -858,7 +858,6 @@ struct qeth_card { struct napi_struct napi; struct qeth_rx rx; struct delayed_work buffer_reclaim_work; - struct work_struct close_dev_work; }; static inline bool qeth_card_hw_is_reachable(struct qeth_card *card) |