diff options
author | Ido Schimmel <idosch@nvidia.com> | 2021-10-12 16:25:16 +0300 |
---|---|---|
committer | Michal Kubecek <mkubecek@suse.cz> | 2021-11-08 18:17:57 +0100 |
commit | d7d15f737ab72c099a4be3ec2a8be81da0938524 (patch) | |
tree | 5336906e21c42f058d15f9958dc116fb8f538baa | |
parent | 6acaeb94402ad19e14cadf5815ccbc6196f2a3e3 (diff) | |
download | ethtool-d7d15f737ab72c099a4be3ec2a8be81da0938524.tar.gz |
sff-8636: Rename SFF-8636 parsing functions
Currently, there are two SFF-8636 parsing functions. sff8636_show_all()
and sff8636_show_all_paged(). The former is called from the IOCTL path
with a buffer containing EEPROM contents and the latter is called from
the netlink path with pointer to individual EEPROM pages.
Rename them with '_ioctl' and '_nl' suffixes to make the distinction
clear.
In subsequent patches, these two functions will only differ in the way
they initialize the SFF-8636 memory map for parsing, while the parsing
code itself will be shared between the two.
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
-rw-r--r-- | ethtool.c | 4 | ||||
-rw-r--r-- | internal.h | 6 | ||||
-rw-r--r-- | netlink/module-eeprom.c | 2 | ||||
-rw-r--r-- | qsfp.c | 6 |
4 files changed, 9 insertions, 9 deletions
@@ -4908,8 +4908,8 @@ static int do_getmodule(struct cmd_context *ctx) break; case ETH_MODULE_SFF_8436: case ETH_MODULE_SFF_8636: - sff8636_show_all(eeprom->data, - modinfo.eeprom_len); + sff8636_show_all_ioctl(eeprom->data, + modinfo.eeprom_len); break; #endif default: @@ -390,9 +390,9 @@ void sff8079_show_all(const __u8 *id); void sff8472_show_all(const __u8 *id); /* QSFP Optics diagnostics */ -void sff8636_show_all(const __u8 *id, __u32 eeprom_len); -void sff8636_show_all_paged(const struct ethtool_module_eeprom *page_zero, - const struct ethtool_module_eeprom *page_three); +void sff8636_show_all_ioctl(const __u8 *id, __u32 eeprom_len); +void sff8636_show_all_nl(const struct ethtool_module_eeprom *page_zero, + const struct ethtool_module_eeprom *page_three); /* FUJITSU Extended Socket network device */ int fjes_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); diff --git a/netlink/module-eeprom.c b/netlink/module-eeprom.c index fc4ef1a..18b1abb 100644 --- a/netlink/module-eeprom.c +++ b/netlink/module-eeprom.c @@ -328,7 +328,7 @@ static void decoder_print(void) case SFF8024_ID_QSFP: case SFF8024_ID_QSFP28: case SFF8024_ID_QSFP_PLUS: - sff8636_show_all_paged(page_zero, page_three); + sff8636_show_all_nl(page_zero, page_three); break; case SFF8024_ID_QSFP_DD: case SFF8024_ID_DSFP: @@ -853,7 +853,7 @@ static void sff8636_show_page_zero(const __u8 *id) } -void sff8636_show_all(const __u8 *id, __u32 eeprom_len) +void sff8636_show_all_ioctl(const __u8 *id, __u32 eeprom_len) { if (id[SFF8636_ID_OFFSET] == SFF8024_ID_QSFP_DD) { cmis_show_all_ioctl(id); @@ -871,8 +871,8 @@ void sff8636_show_all(const __u8 *id, __u32 eeprom_len) } } -void sff8636_show_all_paged(const struct ethtool_module_eeprom *page_zero, - const struct ethtool_module_eeprom *page_three) +void sff8636_show_all_nl(const struct ethtool_module_eeprom *page_zero, + const struct ethtool_module_eeprom *page_three) { sff8636_show_identifier(page_zero->data); sff8636_show_page_zero(page_zero->data); |