From: Vincent Bernat <bernat@luffy.cx>
Date: Wed, 9 Jun 2010 12:59:22 +0000 (+0200)
Subject: Group together related configuration information.
X-Git-Tag: 0.5.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abcbb8205d2d3131347e54987485495a77a7a9f4;p=thirdparty%2Flldpd.git

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 4fd6d159..90fa9855 100644
--- 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;