Merge tag 'net-next-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[platform/kernel/linux-starfive.git] / drivers / net / ethernet / marvell / octeontx2 / nic / otx2_pf.c

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
index db3fcab..fe8ea4e 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -272,8 +272,7 @@ static int otx2_pf_flr_init(struct otx2_nic *pf, int num_vfs)
 {
        int vf;
 
-       pf->flr_wq = alloc_workqueue("otx2_pf_flr_wq",
-                                    WQ_UNBOUND | WQ_HIGHPRI, 1);
+       pf->flr_wq = alloc_ordered_workqueue("otx2_pf_flr_wq", WQ_HIGHPRI);
        if (!pf->flr_wq)
                return -ENOMEM;
 
@@ -594,9 +593,8 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs)
        if (!pf->mbox_pfvf)
                return -ENOMEM;
 
-       pf->mbox_pfvf_wq = alloc_workqueue("otx2_pfvf_mailbox",
-                                          WQ_UNBOUND | WQ_HIGHPRI |
-                                          WQ_MEM_RECLAIM, 1);
+       pf->mbox_pfvf_wq = alloc_ordered_workqueue("otx2_pfvf_mailbox",
+                                                  WQ_HIGHPRI | WQ_MEM_RECLAIM);
        if (!pf->mbox_pfvf_wq)
                return -ENOMEM;
 
@@ -1060,9 +1058,8 @@ static int otx2_pfaf_mbox_init(struct otx2_nic *pf)
        int err;
 
        mbox->pfvf = pf;
-       pf->mbox_wq = alloc_workqueue("otx2_pfaf_mailbox",
-                                     WQ_UNBOUND | WQ_HIGHPRI |
-                                     WQ_MEM_RECLAIM, 1);
+       pf->mbox_wq = alloc_ordered_workqueue("otx2_pfaf_mailbox",
+                                             WQ_HIGHPRI | WQ_MEM_RECLAIM);
        if (!pf->mbox_wq)
                return -ENOMEM;