Index: /src/router/openlldp/src/lldp_debug.c
===================================================================
--- /src/router/openlldp/src/lldp_debug.c (revision 8347)
+++ /src/router/openlldp/src/lldp_debug.c (revision 8348)
@@ -38,146 +38,5 @@
 }
 
-/* Borrowed from Open1X */
-/**
- *
- * Dump hex values, without the ascii versions.
- *
- */
-void debug_hex_printf(unsigned char level, uint8_t *hextodump, int size)
-{
-  int i;
-  int len = 0;
-  char logstr[(size * 3) + 2];
 
-  if ((!(debug_level & level)) && (level != 0))
-    return;
-
-  if (hextodump == NULL)
-    return;
-
-  for (i = 0; i < size; i++)
-    {
-      logstr[len++] = to_hex_char(hextodump[i] >> 4);
-      logstr[len++] = to_hex_char(hextodump[i]);
-      logstr[len++] = ' ';
-    }
-
-  logstr[len++] = '\n';
-  logstr[len] = 0;
-  ufprintf(logfile, logstr, level);
-}
-
-/**
- *
- * Depending on the value of fh, we will either print to the screen, or
- * a log file.
- *
- */
-void ufprintf(FILE *fh, char *instr, int level)
-{
-
-  // If xsup_debug.c is used outside the main Xsupplicant source, it will
-  // get compiler errors because of the lack of xsup_ipc.*.  So, we should
-  // define EXTERNAL_USE so that we don't attempt to build that part.
-  /*#ifndef EXTERNAL_USE
-  // No matter what, we want to send it to connected gui interfaces.
-  if (level == DEBUG_NORMAL)
-    {
-      xsup_ipc_send_log(level, instr);
-    }
-    #endif*/
-
-  // No decide where else to log to.
-  if (((isdaemon == 2) || (fh == NULL)) && (syslogging != 1))
-    {
-      printf("%s", instr);
-      fflush(stdout);
-    } else if (syslogging ==1) {
-      // XXX Consider ways of using other log levels.
-      syslog(LOG_ALERT, "%s", instr);
-    } else {
-      fprintf(fh, "%s", instr);
-      fflush(fh);
-    }
-}
-
-/**
- *
- * dump some hex values -- also
- * show the ascii version of the dump.
- *
- */
-void debug_hex_dump(unsigned char level, uint8_t *hextodump, int size)
-{
-  int i;
-  char buf[80];
-  int str_idx = 0;
-  int chr_idx = 0;
-  int count;
-  int total;
-  int tmp;
-
-  if ((!(debug_level & level)) && (level != 0))
-    return;
-
-  if (hextodump == NULL)
-    return;
-
-  /* Initialize constant fields */
-  memset(buf, ' ', sizeof(buf));
-  buf[4]  = '|';
-  buf[54] = '|';
-  buf[72] = '\n';
-  buf[73] = 0;
-
-  count = 0;
-  total = 0;
-  for (i = 0; i < size; i++)
-    {
-      if (count == 0)
-        {
-          str_idx = 6;
-          chr_idx = 56;
-
-          buf[0] = to_hex_char(total >> 8);
-          buf[1] = to_hex_char(total >> 4);
-          buf[2] = to_hex_char(total);
-        }
-
-      /* store the number */
-      tmp = hextodump[i];
-      buf[str_idx++] = to_hex_char(tmp >> 4);
-      buf[str_idx++] = to_hex_char(tmp);
-      str_idx++;
-
-      /* store the character */
-      buf[chr_idx++] = isprint(tmp) ? tmp : '.';
-
-      total++;
-      count++;
-      if (count >= 16)
-        {
-          count = 0;
-          ufprintf(logfile, buf, level);
-        }
-    }
-
-  /* Print partial line if any */
-  if (count != 0)
-    {
-      /* Clear out any junk */
-      while (count < 16)
-        {
-          buf[str_idx]   = ' ';   /* MSB hex */
-          buf[str_idx+1] = ' ';   /* LSB hex */
-          str_idx += 3;
-
-          buf[chr_idx++] = ' ';
-
-          count++;
-        }
-      ufprintf(logfile, buf, level);
-    }
-}
 
 /**
@@ -187,56 +46,4 @@
  *
  */
-void debug_printf(unsigned char level, char *fmt, ...)
-{
-  char dumpstr[2048], temp[2048];
-
-  if (((level & debug_level) || (level == 0)) && (fmt != NULL))
-    {
-      va_list ap;
-      va_start(ap, fmt);
-
-      memset((char *)&dumpstr, 0x00, 2048);
-      memset((char *)&temp, 0x00, 2048);
-
-      // Print out a tag that identifies the type of debug message being used.
-      switch (level)
-        {
-        case DEBUG_NORMAL:
-          break;
-
-        case DEBUG_CONFIG:
-          strcpy((char *)&dumpstr, "[CONFIG] ");
-          break;
-
-        case DEBUG_STATE:
-          strcpy((char *)&dumpstr, "[STATE] ");
-          break;
-
-        case DEBUG_TLV:
-          strcpy((char *)&dumpstr, "[TLV] ");
-          break;
-
-        case DEBUG_INT:
-          strcpy((char *)&dumpstr, "[INT] ");
-          break;
-
-        case DEBUG_EVERYTHING:
-          strcpy((char *)&dumpstr, "[ALL] ");
-          break;
-
-        case DEBUG_EXCESSIVE:
-          strcpy((char *)&dumpstr, "[EXCESSIVE] ");
-          break;
-        }
-
-      vsnprintf((char *)&temp, 2048, fmt, ap);
-
-      strcat((char *)&dumpstr, (char *)&temp);
-
-      ufprintf(logfile, dumpstr, level);
-
-      va_end(ap);
-    }
-}
 
 
Index: /src/router/openlldp/src/lldp_debug.h
===================================================================
--- /src/router/openlldp/src/lldp_debug.h (revision 8347)
+++ /src/router/openlldp/src/lldp_debug.h (revision 8348)
@@ -46,8 +46,9 @@
 void lowercase(char *);
 void debug_setdaemon(int);
-void debug_printf(unsigned char, char *, ...);
-void debug_printf_nl(unsigned char, char *, ...);
-void debug_hex_printf(unsigned char, uint8_t *, int);
-void debug_hex_dump(unsigned char, uint8_t *, int);
+
+#define debug_printf(a, n, ...) 
+#define debug_printf_nl(a, n, ...) 
+#define debug_hex_printf(a, n, ...) 
+#define debug_hex_dump(a, n, ...) 
 void debug_set_flags(int);
 void debug_alpha_set_flags(char *);
Index: /src/router/openlldp/src/lldp_neighbor.c
===================================================================
--- /src/router/openlldp/src/lldp_neighbor.c (revision 8347)
+++ /src/router/openlldp/src/lldp_neighbor.c (revision 8348)
@@ -48,5 +48,5 @@
   strcpy(lldp_systemdesc, sysinfo.machine);
   strcat(lldp_systemdesc, "/");
-  strcat(lldp_systemdesc, sysinfo.sysname);  
+  strcat(lldp_systemdesc, "DD-WRT Linux");  
   strcat(lldp_systemdesc, " ");
   strcat(lldp_systemdesc, sysinfo.release);