diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:42:13 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:44:09 -0800 |
| commit | 55fd59b003f6e8fd88cf16590e79823d7ccf3026 (patch) | |
| tree | f23b2225f1a00b80632d612428708d5a57ad330b /drivers/net/ethernet/ibm/ibmvnic.h | |
| parent | Merge branch 'mptcp-reject-invalid-mp_join-requests-right-away' (diff) | |
| parent | Merge tag 'net-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-55fd59b003f6e8fd88cf16590e79823d7ccf3026.tar.xz linux-dev-55fd59b003f6e8fd88cf16590e79823d7ccf3026.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.h')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h index 9d0c32ad763b..c09c3f6bba9f 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.h +++ b/drivers/net/ethernet/ibm/ibmvnic.h @@ -1087,6 +1087,9 @@ struct ibmvnic_adapter { struct delayed_work ibmvnic_delayed_reset; unsigned long resetting; bool napi_enabled, from_passive_init; + bool login_pending; + /* last device reset time */ + unsigned long last_reset_time; bool failover_pending; bool force_reset_recovery; |