Skip to content

Commit 155a1ef

Browse files
emuslnPaolo Abeni
authored andcommitted
ionic: restore netdev feature bits after reset
When rebuilding the lif after an FLR, be sure to restore the current netdev features, not do the usual first time feature init. This prevents losing user changes to things like TSO or vlan tagging states. Fixes: 45b8418 ("ionic: keep filters across FLR") Reviewed-by: Brett Creeley <[email protected]> Signed-off-by: Shannon Nelson <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 7662fad commit 155a1ef

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/net/ethernet/pensando/ionic/ionic_lif.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3559,7 +3559,10 @@ int ionic_lif_init(struct ionic_lif *lif)
35593559
goto err_out_notifyq_deinit;
35603560
}
35613561

3562-
err = ionic_init_nic_features(lif);
3562+
if (test_bit(IONIC_LIF_F_FW_RESET, lif->state))
3563+
err = ionic_set_nic_features(lif, lif->netdev->features);
3564+
else
3565+
err = ionic_init_nic_features(lif);
35633566
if (err)
35643567
goto err_out_notifyq_deinit;
35653568

0 commit comments

Comments
 (0)