The following commit has been merged in the linux branch: commit d773099247b83109b2a675a3cd63695d8c7d940b Author: simon simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c Date: Sun Dec 13 18:30:30 2009 +0000

Staging: batman-adv: Remove whitespace style errors

checkpatch.pl found different smaller errors regarding trailing whitespaces or trailing extra newlines before EOF. These should be removed to follow linux-2.6 CodingStyle.

Signed-off-by: Sven Eckelmann sven.eckelmann@gmx.de Signed-off-by: Simon Wundelrich siwu@hrz.tu-chemnitz.de Signed-off-by: Andrew Lunn andrew@lunn.ch

diff --git a/drivers/staging/batman-adv/CHANGELOG b/drivers/staging/batman-adv/CHANGELOG index 18d82f5..8a18163 100644 --- a/drivers/staging/batman-adv/CHANGELOG +++ b/drivers/staging/batman-adv/CHANGELOG @@ -19,7 +19,7 @@ batman-adv 0.1: * support latest kernels (2.6.20 - 2.6.28) * LOTS of cleanup: locking, stack usage, memory leaks * Change Ethertype from 0x0842 to 0x4305 - unregistered at IEEE, if you want to sponsor an official Ethertype ($2500) + unregistered at IEEE, if you want to sponsor an official Ethertype ($2500) please contact us

-- Sun, 28 Dec 2008 00:44:31 +0100 diff --git a/drivers/staging/batman-adv/TODO b/drivers/staging/batman-adv/TODO index caafb5f..48e1c75 100644 --- a/drivers/staging/batman-adv/TODO +++ b/drivers/staging/batman-adv/TODO @@ -38,5 +38,5 @@ * make use of printk %pM support instead of converting mac addresses * manually

-=> strip out all backward compatibility support to older kernels +=> strip out all backward compatibility support to older kernels (only found in compat.h) diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c index 9962af7..80106f7 100644 --- a/drivers/staging/batman-adv/originator.c +++ b/drivers/staging/batman-adv/originator.c @@ -239,5 +239,3 @@ void purge_orig(struct work_struct *work)

start_purge_timer(); } - - diff --git a/drivers/staging/batman-adv/originator.h b/drivers/staging/batman-adv/originator.h index 6ef7a05..c1a9c2d 100644 --- a/drivers/staging/batman-adv/originator.h +++ b/drivers/staging/batman-adv/originator.h @@ -28,4 +28,3 @@ struct orig_node *get_orig_node(uint8_t *addr); struct neigh_node * create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node, uint8_t *neigh, struct batman_if *if_incoming); - diff --git a/drivers/staging/batman-adv/proc.c b/drivers/staging/batman-adv/proc.c index ed4c734..f476d9c 100644 --- a/drivers/staging/batman-adv/proc.c +++ b/drivers/staging/batman-adv/proc.c @@ -827,5 +827,3 @@ int setup_procfs(void)

return 0; } - - diff --git a/drivers/staging/batman-adv/routing.c b/drivers/staging/batman-adv/routing.c index f4be6be..2873468 100644 --- a/drivers/staging/batman-adv/routing.c +++ b/drivers/staging/batman-adv/routing.c @@ -1063,4 +1063,3 @@ void batman_data_ready(struct sock *sk, int len) atomic_set(&data_ready_cond, 1); wake_up_interruptible(&thread_wait); } - diff --git a/drivers/staging/batman-adv/routing.h b/drivers/staging/batman-adv/routing.h index 985728f..890a4f5 100644 --- a/drivers/staging/batman-adv/routing.h +++ b/drivers/staging/batman-adv/routing.h @@ -27,9 +27,9 @@ extern atomic_t exit_cond; void slide_own_bcast_window(struct batman_if *batman_if); void batman_data_ready(struct sock *sk, int len); int packet_recv_thread(void *data); -void receive_bat_packet(struct ethhdr *ethhdr, - struct batman_packet *batman_packet, - unsigned char *hna_buff, int hna_buff_len, +void receive_bat_packet(struct ethhdr *ethhdr, + struct batman_packet *batman_packet, + unsigned char *hna_buff, int hna_buff_len, struct batman_if *if_incoming); void update_routes(struct orig_node *orig_node, struct neigh_node *neigh_node, diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c index cdb8aab..c26d48c 100644 --- a/drivers/staging/batman-adv/vis.c +++ b/drivers/staging/batman-adv/vis.c @@ -559,4 +559,3 @@ static void start_vis_timer(void) queue_delayed_work(bat_event_workqueue, &vis_timer_wq, (atomic_read(&vis_interval)/1000) * HZ); } -