xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pci: Add VPD information field helper functions

Browse Source 
This patch adds a preprocessor constant to describe the PCI VPD
information field header size and an inline function to extract the
size of the information field itself.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Carlson
2010-02-26 14:04:42 +00:00
committed by David S. Miller
parent b55ac1b226
commit e1d5bdabb9
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/bnx2.c
View File

@@ -7784,14 +7784,15 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp)
goto vpd_done;
while (i < (block_end - 2)) {
int len = data[i + 2];
int len = pci_vpd_info_field_size(&data[i]);
if (i + 3 + len > block_end)
if (i + PCI_VPD_INFO_FLD_HDR_SIZE + len > block_end)
goto vpd_done;
if (data[i] == 'M' && data[i + 1] == 'N') {
if (len != 4 ||
memcmp(&data[i + 3], "1028", 4))
memcmp(&data[i + PCI_VPD_INFO_FLD_HDR_SIZE],
"1028", 4))
goto vpd_done;
mn_match = true;
@@ -7800,9 +7801,9 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp)
goto vpd_done;
v0_len = len;
v0_str = &data[i + 3];
v0_str = &data[i + PCI_VPD_INFO_FLD_HDR_SIZE];
}
i += 3 + len;
i += PCI_VPD_INFO_FLD_HDR_SIZE + len;
if (mn_match && v0_str) {
memcpy(bp->fw_version, v0_str, v0_len);