The following commit has been merged in the master branch: commit 5c070b66d4726dc25cd82fbe48ee476979103b50 Author: marek marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c Date: Sat Nov 7 13:45:41 2009 +0000

Mark local symbols as static

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de

git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1469 45894c77-fb22-0410-b583-ff6e7d5dbf6c

diff --git a/aggregation.c b/aggregation.c index 5a31e94..9c6e681 100644 --- a/aggregation.c +++ b/aggregation.c @@ -88,7 +88,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, }

/* create a new aggregated packet and add this packet to it */ -void new_aggregated_packet(unsigned char *packet_buff, +static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, unsigned long send_time, bool direct_link, diff --git a/hard-interface.c b/hard-interface.c index fdc5add..5ea35da 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -72,7 +72,7 @@ int hardif_min_mtu(void) return min_mtu; }

-void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(uint8_t *addr) { struct batman_if *batman_if; char mac_string[ETH_STR_LEN]; @@ -105,7 +105,7 @@ void update_min_mtu(void) }

/* checks if the interface is up. (returns 1 if it is) */ -int hardif_is_interface_up(char *dev) +static int hardif_is_interface_up(char *dev) { struct net_device *net_dev;

@@ -176,7 +176,7 @@ void hardif_deactivate_interface(struct batman_if *batman_if) }

/* (re)activate given interface. */ -void hardif_activate_interface(struct batman_if *batman_if) +static void hardif_activate_interface(struct batman_if *batman_if) { struct sockaddr_ll bind_addr; int retval; diff --git a/proc.c b/proc.c index b3eb69d..792a006 100644 --- a/proc.c +++ b/proc.c @@ -30,7 +30,7 @@ #include "vis.h" #include "compat.h"

-uint8_t vis_format = DOT_DRAW; +static uint8_t vis_format = DOT_DRAW;

static struct proc_dir_entry *proc_batman_dir, *proc_interface_file; static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file; diff --git a/routing.c b/routing.c index 220dbf7..b33cef9 100644 --- a/routing.c +++ b/routing.c @@ -46,7 +46,7 @@ static DECLARE_DELAYED_WORK(purge_orig_wq, purge_orig); static atomic_t data_ready_cond; atomic_t exit_cond;

-void start_purge_timer(void) +static void start_purge_timer(void) { queue_delayed_work(bat_event_workqueue, &purge_orig_wq, 1 * HZ); } @@ -618,7 +618,7 @@ void purge_orig(struct work_struct *work) start_purge_timer(); }

-int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) +static int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) { struct kvec iov; struct msghdr msg; diff --git a/soft-interface.c b/soft-interface.c index 18e5e8f..d543f50 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -68,7 +68,7 @@ int main_if_was_up(void) return (memcmp(mainIfAddr, mainIfAddr_default, ETH_ALEN) != 0 ? 1 : 0); }

-int my_skb_push(struct sk_buff *skb, unsigned int len) +static int my_skb_push(struct sk_buff *skb, unsigned int len) { int result = 0;

diff --git a/translation-table.c b/translation-table.c index 9936bc2..c2190e1 100644 --- a/translation-table.c +++ b/translation-table.c @@ -32,7 +32,7 @@ static struct hashtable_t *hna_global_hash; atomic_t hna_local_changed;

DEFINE_SPINLOCK(hna_local_hash_lock); -DEFINE_SPINLOCK(hna_global_hash_lock); +static DEFINE_SPINLOCK(hna_global_hash_lock);

static DECLARE_DELAYED_WORK(hna_local_purge_wq, hna_local_purge);

diff --git a/vis.c b/vis.c index 22235ad..f6c9acb 100644 --- a/vis.c +++ b/vis.c @@ -369,7 +369,7 @@ static int generate_vis_packet(void) return 0; }

-void purge_vis_packets(void) +static void purge_vis_packets(void) { struct hash_it_t *hashit = NULL; struct vis_info *info;