Commit 6548755c authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'ibmvnic-assorted-bug-fixes'

Dany Madden says:

====================
ibmvnic: assorted bug fixes

Assorted fixes for ibmvnic originated from "[PATCH net 00/15] ibmvnic:
assorted bug fixes" sent by Lijun Pan.
====================

Link: https://lore.kernel.org/r/20201126000432.29897-1-drt@linux.ibm.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bd2d5c54 98c41f04
This diff is collapsed.
...@@ -1086,6 +1086,9 @@ struct ibmvnic_adapter { ...@@ -1086,6 +1086,9 @@ struct ibmvnic_adapter {
struct delayed_work ibmvnic_delayed_reset; struct delayed_work ibmvnic_delayed_reset;
unsigned long resetting; unsigned long resetting;
bool napi_enabled, from_passive_init; bool napi_enabled, from_passive_init;
bool login_pending;
/* last device reset time */
unsigned long last_reset_time;
bool failover_pending; bool failover_pending;
bool force_reset_recovery; bool force_reset_recovery;
......
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