Skip to content

Commit e90f658

Browse files
ErwanAliasr1Ma Wupeng
authored andcommitted
i40e: Report MFS in decimal base instead of hex
stable inclusion from stable-v6.6.30 commit a91892696f58799972b11490f972ad3588241606 bugzilla: https://gitee.com/openeuler/kernel/issues/I9MPZ8 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a91892696f58799972b11490f972ad3588241606 -------------------------------- [ Upstream commit ef3c313119ea448c22da10366faa26b5b4b1a18e ] If the MFS is set below the default (0x2600), a warning message is reported like the following : MFS for port 1 has been set below the default: 600 This message is a bit confusing as the number shown here (600) is in fact an hexa number: 0x600 = 1536 Without any explicit "0x" prefix, this message is read like the MFS is set to 600 bytes. MFS, as per MTUs, are usually expressed in decimal base. This commit reports both current and default MFS values in decimal so it's less confusing for end-users. A typical warning message looks like the following : MFS for port 1 (1536) has been set below the default (9728) Signed-off-by: Erwan Velu <e.velu@criteo.com> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Tony Brelinski <tony.brelinski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Fixes: 3a2c6ce ("i40e: Add a check to see if MFS is set") Link: https://lore.kernel.org/r/20240423182723.740401-3-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
1 parent 139e2d9 commit e90f658

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16237,8 +16237,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1623716237
val = (rd32(&pf->hw, I40E_PRTGL_SAH) &
1623816238
I40E_PRTGL_SAH_MFS_MASK) >> I40E_PRTGL_SAH_MFS_SHIFT;
1623916239
if (val < MAX_FRAME_SIZE_DEFAULT)
16240-
dev_warn(&pdev->dev, "MFS for port %x has been set below the default: %x\n",
16241-
pf->hw.port, val);
16240+
dev_warn(&pdev->dev, "MFS for port %x (%d) has been set below the default (%d)\n",
16241+
pf->hw.port, val, MAX_FRAME_SIZE_DEFAULT);
1624216242

1624316243
/* Add a filter to drop all Flow control frames from any VSI from being
1624416244
* transmitted. By doing so we stop a malicious VF from sending out

0 commit comments

Comments
 (0)