diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-04-30 18:02:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-30 18:02:46 -0700 |
| commit | de04604e2314ac2c9fa37e071270f6bc157844a9 (patch) | |
| tree | 70212e8b1786f55599baaaa99103a617ebcd459b | |
| parent | dp83640: reverse arguments to list_add_tail (diff) | |
| parent | ionic: add device reset to fw upgrade down (diff) | |
| download | wireguard-linux-de04604e2314ac2c9fa37e071270f6bc157844a9.tar.xz wireguard-linux-de04604e2314ac2c9fa37e071270f6bc157844a9.zip | |
Merge branch 'ionic-fw-upgrade-bug-fixes'
Shannon Nelson says:
====================
ionic: fw upgrade bug fixes
These patches address issues found in additional internal
fw-upgrade testing.
v2:
- replaced extra state flag with postponing first link check
- added device reset patch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 5acf4f46c268..d5293bfded29 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -2101,6 +2101,7 @@ static void ionic_lif_handle_fw_down(struct ionic_lif *lif) ionic_txrx_free(lif); } ionic_lifs_deinit(ionic); + ionic_reset(ionic); ionic_qcqs_free(lif); dev_info(ionic->dev, "FW Down: LIFs stopped\n"); @@ -2116,6 +2117,7 @@ static void ionic_lif_handle_fw_up(struct ionic_lif *lif) dev_info(ionic->dev, "FW Up: restarting LIFs\n"); + ionic_init_devinfo(ionic); err = ionic_qcqs_alloc(lif); if (err) goto err_out; @@ -2549,8 +2551,6 @@ int ionic_lifs_register(struct ionic *ionic) dev_err(ionic->dev, "Cannot register net device, aborting\n"); return err; } - - ionic_link_status_check_request(ionic->master_lif); ionic->master_lif->registered = true; return 0; |