From 0265b1e5bdb07ac765d13e9fdb6563565102c974 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 20 Oct 2011 08:26:35 +0200 Subject: [PATCH] dmi: only enable DMI for x86 platforms --- CHANGELOG | 2 +- src/dmi.c | 2 ++ src/lldpd.c | 2 ++ src/lldpd.h | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 6740478c..7451b4f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ lldpd (0.5.5) + Key/value output was incorrect when a dot was present in interface names. This is fixed but it is preferable to use XML output since the parsing is more difficult in this case. - + Only grab DMI information once. + + Only grab DMI information once. Only uses DMI for x86 platform. lldpd (0.5.4) * Features: diff --git a/src/dmi.c b/src/dmi.c index 367ae0d0..14aa895b 100644 --- a/src/dmi.c +++ b/src/dmi.c @@ -29,6 +29,7 @@ - asset: /sys/class/dmi/id/chassis_asset_tag */ +#if __i386__ || __amd64__ char* dmi_get(char *file) { @@ -90,3 +91,4 @@ dmi_asset() return dmi_get(SYSFS_CLASS_DMI "chassis_asset_tag"); } #endif +#endif diff --git a/src/lldpd.c b/src/lldpd.c index a846ca64..f3e0d16e 100644 --- a/src/lldpd.c +++ b/src/lldpd.c @@ -921,6 +921,7 @@ lldpd_send_all(struct lldpd *cfg) static void lldpd_med(struct lldpd_chassis *chassis) { +#if __i386__ || __amd64__ static short int once = 0; if (!once) { chassis->c_med_hw = dmi_hw(); @@ -931,6 +932,7 @@ lldpd_med(struct lldpd_chassis *chassis) chassis->c_med_asset = dmi_asset(); once = 1; } +#endif } #endif diff --git a/src/lldpd.h b/src/lldpd.h index 71a9a167..e6e619a6 100644 --- a/src/lldpd.h +++ b/src/lldpd.h @@ -481,6 +481,7 @@ void lldpd_ifh_mgmt(struct lldpd *, struct ifaddrs *); /* dmi.c */ #ifdef ENABLE_LLDPMED +#if __i386__ || __amd64__ char *dmi_hw(void); char *dmi_fw(void); char *dmi_sn(void); @@ -488,6 +489,7 @@ char *dmi_manuf(void); char *dmi_model(void); char *dmi_asset(void); #endif +#endif /* log.c */ void log_init(int, const char *); -- 2.39.5