Staging: batman-adv: Remove dead max addr and obsolete VIS_FORMAT strings

Max address is not being used anywhere and just misleading, therefore
removing it. VIS_FORMAT string is now obsolete, so also remove it.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h
index 5fdf5afd820278b308d4baa7d242c26d57f2b429..2494f5a97ad8411a0f3846ae834c7532db47e3e8 100644 (file)
--- a/drivers/staging/batman-adv/main.h
+++ b/drivers/staging/batman-adv/main.h
@@ -34,8 +34,6 @@
 #define TQ_MAX_VALUE 255
 #define JITTER 20
 #define TTL 50                   /* Time To Live of broadcast messages */
-#define MAX_ADDR 16              /* number of interfaces which can be added to
-                                  * batman. */
 
 #define PURGE_TIMEOUT 200000     /* purge originators after time in ms if no
                                   * valid packet comes in -> TODO: check

diff --git a/drivers/staging/batman-adv/vis.h b/drivers/staging/batman-adv/vis.h
index 98d89723160c7c1d54ccfc61f34a67c5cef67267..4e417fb17b94ec1c5f7626d5911a31d999feebea 100644 (file)
--- a/drivers/staging/batman-adv/vis.h
+++ b/drivers/staging/batman-adv/vis.h
@@ -20,8 +20,6 @@
  */
 
 #define VIS_TIMEOUT            200000
-#define VIS_FORMAT_DD_NAME     "dot_draw"
-#define VIS_FORMAT_JSON_NAME   "json"
 
 struct vis_info {
        unsigned long       first_seen;