|
 |
1f2507 |
From 08d9f72f5e4ce12e2cc1fc47d1ffde9aa1326c8c Mon Sep 17 00:00:00 2001
|
|
|
1f2507 |
From: Ido Schimmel <idosch@nvidia.com>
|
|
|
1f2507 |
Date: Tue, 14 Sep 2021 14:27:38 +0300
|
|
|
1f2507 |
Subject: [PATCH 05/35] netlink: eeprom: Fix compilation when pretty dump is
|
|
|
1f2507 |
disabled
|
|
|
1f2507 |
|
|
|
1f2507 |
When pretty dump is disabled (i.e., configure --disable-pretty-dump),
|
|
|
1f2507 |
the following errors are emitted:
|
|
|
1f2507 |
|
|
|
1f2507 |
/usr/bin/ld: netlink/module-eeprom.o: in function `decoder_print':
|
|
|
1f2507 |
netlink/module-eeprom.c:330: undefined reference to `sff8636_show_all_paged'
|
|
|
1f2507 |
netlink/module-eeprom.c:334: undefined reference to `cmis_show_all'
|
|
|
1f2507 |
netlink/module-eeprom.c:325: undefined reference to `sff8079_show_all'
|
|
|
1f2507 |
|
|
|
1f2507 |
The else clause is unreachable when pretty dump is disabled, so wrap it
|
|
|
1f2507 |
with ifdef directive.
|
|
|
1f2507 |
|
|
|
1f2507 |
This will be re-worked in future patches where the netlink code only
|
|
|
1f2507 |
queries the SFF-8024 Identifier Value and defers page requests to
|
|
|
1f2507 |
individual parsers.
|
|
|
1f2507 |
|
|
|
1f2507 |
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
|
|
|
1f2507 |
---
|
|
|
1f2507 |
netlink/module-eeprom.c | 4 ++++
|
|
|
1f2507 |
1 file changed, 4 insertions(+)
|
|
|
1f2507 |
|
|
|
1f2507 |
diff --git a/netlink/module-eeprom.c b/netlink/module-eeprom.c
|
|
|
1f2507 |
index e9a122df3259..48cd2cc55bee 100644
|
|
|
1f2507 |
--- a/netlink/module-eeprom.c
|
|
|
1f2507 |
+++ b/netlink/module-eeprom.c
|
|
|
1f2507 |
@@ -275,6 +275,7 @@ static int page_fetch(struct nl_context *nlctx, const struct ethtool_module_eepr
|
|
|
1f2507 |
return nlsock_process_reply(nlsock, nomsg_reply_cb, NULL);
|
|
|
1f2507 |
}
|
|
|
1f2507 |
|
|
|
1f2507 |
+#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
|
|
|
1f2507 |
static int decoder_prefetch(struct nl_context *nlctx)
|
|
|
1f2507 |
{
|
|
|
1f2507 |
struct ethtool_module_eeprom *page_zero_lower = cache_get(0, 0, ETH_I2C_ADDRESS_LOW);
|
|
|
1f2507 |
@@ -338,6 +339,7 @@ static void decoder_print(void)
|
|
|
1f2507 |
break;
|
|
|
1f2507 |
}
|
|
|
1f2507 |
}
|
|
|
1f2507 |
+#endif
|
|
|
1f2507 |
|
|
|
1f2507 |
int nl_getmodule(struct cmd_context *ctx)
|
|
|
1f2507 |
{
|
|
|
1f2507 |
@@ -414,10 +416,12 @@ int nl_getmodule(struct cmd_context *ctx)
|
|
|
1f2507 |
else
|
|
|
1f2507 |
dump_hex(stdout, eeprom_data, dump_length, request.offset);
|
|
|
1f2507 |
} else {
|
|
|
1f2507 |
+#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
|
|
|
1f2507 |
ret = decoder_prefetch(nlctx);
|
|
|
1f2507 |
if (ret)
|
|
|
1f2507 |
goto cleanup;
|
|
|
1f2507 |
decoder_print();
|
|
|
1f2507 |
+#endif
|
|
|
1f2507 |
}
|
|
|
1f2507 |
|
|
|
1f2507 |
cleanup:
|
|
|
1f2507 |
--
|
|
|
1f2507 |
2.35.1
|
|
|
1f2507 |
|