vis_format is currently in vis.c however this variable is only used in proc.c. Move it into proc, and remove the volatile, which should not be needed.

Signed-off-by: Andrew Lunn andrew.lunn@ascom.ch Index: vis.c =================================================================== --- vis.c (revision 1345) +++ vis.c (working copy) @@ -42,7 +42,6 @@ void free_info(void *data); void send_vis_packet(struct vis_info *info); void start_vis_timer(void); -volatile uint8_t vis_format = DOT_DRAW;

int vis_info_cmp(void *data1, void *data2) { Index: vis.h =================================================================== --- vis.h (revision 1345) +++ vis.h (working copy) @@ -51,7 +51,6 @@

extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -extern volatile uint8_t vis_format;

void receive_vis_packet(struct ethhdr *ethhdr, struct vis_packet *vis_packet, int vis_info_len); void vis_set_mode(int mode); Index: proc.c =================================================================== --- proc.c (revision 1345) +++ proc.c (working copy) @@ -31,6 +31,7 @@ #include "types.h" #include "hash.h"

+static uint8_t vis_format = DOT_DRAW;

static struct proc_dir_entry *proc_batman_dir = NULL, *proc_interface_file = NULL, *proc_orig_interval_file = NULL, *proc_originators_file = NULL;