| From 54e43b0a922c46ba365cbb07e0fa31ec192808d7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Nov 2023 09:12:09 +0100 |
| Subject: i40e: Fix unexpected MFS warning message |
| |
| From: Ivan Vecera <ivecera@redhat.com> |
| |
| [ Upstream commit 7d9f22b3d3ef379ed05bd3f3e2de83dfa8da8258 ] |
| |
| Commit 3a2c6ced90e1 ("i40e: Add a check to see if MFS is set") added |
| a warning message that reports unexpected size of port's MFS (max |
| frame size) value. This message use for the port number local |
| variable 'i' that is wrong. |
| In i40e_probe() this 'i' variable is used only to iterate VSIs |
| to find FDIR VSI: |
| |
| <code> |
| ... |
| /* if FDIR VSI was set up, start it now */ |
| for (i = 0; i < pf->num_alloc_vsi; i++) { |
| if (pf->vsi[i] && pf->vsi[i]->type == I40E_VSI_FDIR) { |
| i40e_vsi_open(pf->vsi[i]); |
| break; |
| } |
| } |
| ... |
| </code> |
| |
| So the warning message use for the port number index of FDIR VSI |
| if this exists or pf->num_alloc_vsi if not. |
| |
| Fix the message by using 'pf->hw.port' for the port number. |
| |
| Fixes: 3a2c6ced90e1 ("i40e: Add a check to see if MFS is set") |
| Signed-off-by: Ivan Vecera <ivecera@redhat.com> |
| Reviewed-by: Simon Horman <horms@kernel.org> |
| Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| index 00ca2b88165cb..a9f5a8a7d3f05 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_main.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c |
| @@ -16195,7 +16195,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| I40E_PRTGL_SAH_MFS_MASK) >> I40E_PRTGL_SAH_MFS_SHIFT; |
| if (val < MAX_FRAME_SIZE_DEFAULT) |
| dev_warn(&pdev->dev, "MFS for port %x has been set below the default: %x\n", |
| - i, val); |
| + pf->hw.port, val); |
| |
| /* Add a filter to drop all Flow control frames from any VSI from being |
| * transmitted. By doing so we stop a malicious VF from sending out |
| -- |
| 2.42.0 |
| |