diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-12 06:37:53 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-12 06:38:36 +0300 |
| commit | ed1f164038b50c5864aa85389f3ffd456f050cca (patch) | |
| tree | f0f9d0fd52a798fbe3450d3d85795346411003a6 /drivers/net/ethernet/netronome | |
| parent | a318d3d54c44f9916cd77ad272083d4a4d68899b (diff) | |
| parent | 84e95149bd341705f0eca6a7fcb955c548805002 (diff) | |
| download | linux-ed1f164038b50c5864aa85389f3ffd456f050cca.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.9 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/netronome')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/lag_conf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c index 361d7c495e2d..2c7bd6e80d99 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c +++ b/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c @@ -337,6 +337,11 @@ static void nfp_fl_lag_do_work(struct work_struct *work) acti_netdevs = kmalloc_array(entry->slave_cnt, sizeof(*acti_netdevs), GFP_KERNEL); + if (!acti_netdevs) { + schedule_delayed_work(&lag->work, + NFP_FL_LAG_DELAY); + continue; + } /* Include sanity check in the loop. It may be that a bond has * changed between processing the last notification and the |