Group together related configuration information.

In "struct lldpd", system description configuration was scattered into
the structure.

diff --git a/src/lldpd.h b/src/lldpd.h
index 4fd6d15949d9cc298efc5d37435cab5b3c4a6c08..90fa9855dda99bdf098788f47f70434b2d04aa59 100644 (file)
--- a/src/lldpd.h
+++ b/src/lldpd.h
@@ -288,11 +288,6 @@ struct lldpd {
        int                      g_delay;
 
        struct protocol         *g_protocols;
-#ifdef ENABLE_LLDPMED
-       int                      g_noinventory;
-#endif
-       int                      g_advertise_version;
-
        time_t                   g_lastsent;
        int                      g_lastrid;
 #ifdef USE_SNMP
@@ -308,6 +303,10 @@ struct lldpd {
 
         char                    *g_descr_override;
        char                    *g_lsb_release;
+       int                      g_advertise_version;
+#ifdef ENABLE_LLDPMED
+       int                      g_noinventory;
+#endif
 
 #define LOCAL_CHASSIS(cfg) ((struct lldpd_chassis *)(TAILQ_FIRST(&cfg->g_chassis)))
        TAILQ_HEAD(, lldpd_chassis) g_chassis;