commits September 2010

commits@lists.open-mesh.org

2 participants
78 discussions

batctl; branch, master, updated. v2010.1.0-65-g86bd87d
by postmaster＠open-mesh.org 18 Sep '10

18 Sep '10

The following commit has been merged in the master branch: commit 86bd87d114102e992cd5e7b940059b2645124e56 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Sep 18 11:22:50 2010 +0200 batctl: change email Signed-off-by: Andreas Langer <an.langer at gmx.de> diff --git a/bat-hosts.c b/bat-hosts.c index 5802e80..888b997 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/functions.c b/functions.c index 497e166..cff8b52 100644 --- a/functions.c +++ b/functions.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/functions.h b/functions.h index 6aa9487..1b1c350 100644 --- a/functions.h +++ b/functions.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/main.h b/main.h index 793d282..8689d67 100644 --- a/main.h +++ b/main.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/man/batctl.8 b/man/batctl.8 index 4ffb412..f98e6ad 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -201,7 +201,7 @@ remember than MAC addresses. .BR dmesg (1), .BR dot (1) .SH AUTHOR -batctl was written by Andreas Langer <a.langer(a)q-dsl.de> and Marek +batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek Lindner <lindner_marek(a)yahoo.de>. .PP This manual page was written by Simon Wunderlich diff --git a/ping.c b/ping.c index affd6ad..288bd01 100644 --- a/ping.c +++ b/ping.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/tcpdump.c b/tcpdump.c index 6994b1e..0f62e65 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de> + * Andreas Langer <an.langer(a)gmx.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/tcpdump.h b/tcpdump.h index 19b0585..f98d63f 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/traceroute.c b/traceroute.c index 63de7e6..dc97a01 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public -- batctl

1 0

batman-adv; branch, master, updated. v2010.1.0-163-g66cd599
by postmaster＠open-mesh.org 18 Sep '10

18 Sep '10

The following commit has been merged in the master branch: commit 66cd599da3c41e6b894d5b1adcceac8dbca2783d Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sat Sep 18 11:14:17 2010 +0000 batman-adv: Mark debugfs files as nonseekable We don't allow to seek in the debugfs socket and log files. Thus we should mark the file descriptor as nonseekable. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Acked-by: Arnd Bergmann <arnd(a)arndb.de> diff --git a/bat_debugfs.c b/bat_debugfs.c index c73ce4a..bd4a12e 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -93,6 +93,7 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...) static int log_open(struct inode *inode, struct file *file) { + nonseekable_open(inode, file); file->private_data = inode->i_private; inc_module_count(); return 0; @@ -177,6 +178,7 @@ static const struct file_operations log_fops = { .release = log_release, .read = log_read, .poll = log_poll, + .llseek = no_llseek, }; static int debug_log_setup(struct bat_priv *bat_priv) diff --git a/icmp_socket.c b/icmp_socket.c index 85c047b..aa64ff8 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -47,6 +47,8 @@ static int bat_socket_open(struct inode *inode, struct file *file) unsigned int i; struct socket_client *socket_client; + nonseekable_open(inode, file); + socket_client = kmalloc(sizeof(struct socket_client), GFP_KERNEL); if (!socket_client) @@ -285,6 +287,7 @@ static const struct file_operations fops = { .read = bat_socket_read, .write = bat_socket_write, .poll = bat_socket_poll, + .llseek = no_llseek, }; int bat_socket_setup(struct bat_priv *bat_priv) -- batman-adv

1 0

batman-adv; branch, master, updated. v2010.1.0-162-g0893b89
by postmaster＠open-mesh.org 18 Sep '10

18 Sep '10

The following commit has been merged in the master branch: commit 0893b89b1bc3640609d572b99201228cd99ad80b Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sat Sep 18 11:11:40 2010 +0000 batman-adv: wait for call_rcu before unloading module synchronize_rcu respective synchronize_net only waits for the rcu grace period to elapse and we may fail to finish the calls which were made to call_rcu in that time. In result the module could be unloaded during the execution of the RCU callbacks. rcu_barrier[1] will now wait for all outstanding RCU callbacks to finish before continuing. [1] Documentation/RCU/rcubarrier.txt Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/main.c b/main.c index e8acb46..a067f75 100644 --- a/main.c +++ b/main.c @@ -74,7 +74,7 @@ static void __exit batman_exit(void) destroy_workqueue(bat_event_workqueue); bat_event_workqueue = NULL; - synchronize_net(); + rcu_barrier(); } int mesh_init(struct net_device *soft_iface) -- batman-adv

1 0

batctl; branch, next, updated. v2010.1.0-8-gb099a12
by postmaster＠open-mesh.org 16 Sep '10

16 Sep '10

The following commit has been merged in the next branch: commit b099a1286065e90a536da1f3e257dccb3b93ad42 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Sep 16 15:13:12 2010 +0200 batctl: fix crash if HOME environment variable is not set Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat-hosts.c b/bat-hosts.c index 8948892..5802e80 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -181,6 +181,9 @@ void bat_hosts_init(void) if (strlen(bat_hosts_path[i]) >= 2 && bat_hosts_path[i][0] == '~' && bat_hosts_path[i][1] == '/') { + if (!homedir) + continue; + strncpy(confdir, homedir, CONF_DIR_LEN); confdir[CONF_DIR_LEN - 1] = '\0'; strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir)); -- batctl

1 0

batctl; branch, master, updated. v2010.1.0-64-g0be7e1d
by postmaster＠open-mesh.org 16 Sep '10

16 Sep '10

The following commit has been merged in the master branch: commit 0be7e1d2743b789db425f8910c45c50b4a8cc7f1 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Sep 16 15:13:12 2010 +0200 batctl: fix crash if HOME environment variable is not set Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat-hosts.c b/bat-hosts.c index 8948892..5802e80 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -181,6 +181,9 @@ void bat_hosts_init(void) if (strlen(bat_hosts_path[i]) >= 2 && bat_hosts_path[i][0] == '~' && bat_hosts_path[i][1] == '/') { + if (!homedir) + continue; + strncpy(confdir, homedir, CONF_DIR_LEN); confdir[CONF_DIR_LEN - 1] = '\0'; strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir)); -- batctl

1 0

linux integration; annotated tag, v2.6.36-rc4, created. v2.6.36-rc4
by postmaster＠open-mesh.org 13 Sep '10

13 Sep '10

The annotated tag, v2.6.36-rc4 has been created at 8607f6908a65fbd41d8eee6d0572425182eced69 (tag) tagging 49553c2ef88749dd502687f4eb9c258bb10a4f44 (commit) replaces v2.6.36-rc3 tagged by Linus Torvalds on Sun Sep 12 16:07:51 2010 -0700 - Shortlog ------------------------------------------------------------ Linux 2.6.36-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAkyNXUwACgkQF3YsRnbiHLuyYQCdHnrWQ+QH20sgymPBSt3H33xJ WZgAoLSgnsDjhMAhmeUtEBqfaSyujmKL =fybT -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, linux, updated. v2.6.36-rc3-500-g47cb2ff
by postmaster＠open-mesh.org 13 Sep '10

13 Sep '10

The following commit has been merged in the linux branch: commit 47cb2ff5a5051d436b2c5a6a420b481c1067faa7 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Mon Sep 13 21:01:44 2010 +0200 Staging: batman-adv: Move mailing list address to .org The official mailing list is run on lists.open-mesh.org and it should be avoided to sent them to lists.open-mesh.net to reduce the number of receipents and double posts. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/drivers/staging/batman-adv/README b/drivers/staging/batman-adv/README index 3a975fc..cab178b 100644 --- a/drivers/staging/batman-adv/README +++ b/drivers/staging/batman-adv/README @@ -229,7 +229,7 @@ CONTACT Please send us comments, experiences, questions, anything :) IRC: #batman on irc.freenode.org -Mailing-list: b.a.t.m.a.n(a)open-mesh.net (optional subscription +Mailing-list: b.a.t.m.a.n(a)open-mesh.org (optional subscription at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) You can also contact the Authors: diff --git a/drivers/staging/batman-adv/TODO b/drivers/staging/batman-adv/TODO index 3af8028..76b2acd 100644 --- a/drivers/staging/batman-adv/TODO +++ b/drivers/staging/batman-adv/TODO @@ -11,5 +11,5 @@ Please send all patches to: Marek Lindner <lindner_marek(a)yahoo.de> Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Andrew Lunn <andrew(a)lunn.ch> - b.a.t.m.a.n(a)lists.open-mesh.net + b.a.t.m.a.n(a)lists.open-mesh.org Greg Kroah-Hartman <gregkh(a)suse.de> -- linux integration

1 0

batctl; branch, next, updated. v2010.1.0-7-g59813c2
by postmaster＠open-mesh.net 12 Sep '10

12 Sep '10

The following commit has been merged in the next branch: commit 59813c22fd716c6b8af77017ec36ddaaea890f9c Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Sep 12 21:35:20 2010 +0000 batctl: checkpatch cleanup of comments checkpatch now detects the start of a comment and warns about usage of multiple spaces at the beginning of a line. We have to replace the ' ' in multiple lines comments by ' * ' to fix it. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/packet.h b/packet.h index 44de1bf..2693383 100644 --- a/packet.h +++ b/packet.h @@ -79,7 +79,7 @@ struct icmp_packet { #define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet - as this is assumed by code that handles ICMP packets */ + * as this is assumed by code that handles ICMP packets */ struct icmp_packet_rr { uint8_t packet_type; uint8_t version; /* batman version field */ -- batctl

1 0

batman-adv; branch, next, updated. v2010.1.0-29-gc9f7cbe
by postmaster＠open-mesh.net 12 Sep '10

12 Sep '10

The following commit has been merged in the next branch: commit c9f7cbeb12cacc988aa947afc7c4ef2de65f5d66 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Sep 12 21:35:20 2010 +0000 batman-adv: checkpatch cleanup of comments checkpatch now detects the start of a comment and warns about usage of multiple spaces at the beginning of a line. We have to replace the ' ' in multiple lines comments by ' * ' to fix it. Checkpatch also wants a comment after a definition of a spinlock_t which describes what it protects. It is currently not possible to add it before the actual struct which includes the spinlock. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/packet.h b/packet.h index 44de1bf..2693383 100644 --- a/packet.h +++ b/packet.h @@ -79,7 +79,7 @@ struct icmp_packet { #define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet - as this is assumed by code that handles ICMP packets */ + * as this is assumed by code that handles ICMP packets */ struct icmp_packet_rr { uint8_t packet_type; uint8_t version; /* batman version field */ diff --git a/types.h b/types.h index 9d744d8..478277f 100644 --- a/types.h +++ b/types.h @@ -109,6 +109,7 @@ struct neigh_node { struct batman_if *if_incoming; }; + struct bat_priv { atomic_t mesh_state; struct net_device_stats stats; @@ -133,13 +134,13 @@ struct bat_priv { struct hashtable_t *hna_local_hash; struct hashtable_t *hna_global_hash; struct hashtable_t *vis_hash; - spinlock_t orig_hash_lock; - spinlock_t forw_bat_list_lock; - spinlock_t forw_bcast_list_lock; - spinlock_t hna_lhash_lock; - spinlock_t hna_ghash_lock; - spinlock_t vis_hash_lock; - spinlock_t vis_list_lock; + spinlock_t orig_hash_lock; /* protects orig_hash */ + spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ + spinlock_t forw_bcast_list_lock; /* protects */ + spinlock_t hna_lhash_lock; /* protects hna_local_hash */ + spinlock_t hna_ghash_lock; /* protects hna_global_hash */ + spinlock_t vis_hash_lock; /* protects vis_hash */ + spinlock_t vis_list_lock; /* protects vis_info::recv_list */ int16_t num_local_hna; atomic_t hna_local_changed; struct delayed_work hna_work; @@ -152,7 +153,7 @@ struct socket_client { struct list_head queue_list; unsigned int queue_len; unsigned char index; - spinlock_t lock; + spinlock_t lock; /* protects queue_list, queue_len, index */ wait_queue_head_t queue_wait; struct bat_priv *bat_priv; }; @@ -204,7 +205,7 @@ struct debug_log { char log_buff[LOG_BUF_LEN]; unsigned long log_start; unsigned long log_end; - spinlock_t lock; + spinlock_t lock; /* protects log_buff, log_start and log_end */ wait_queue_head_t queue_wait; }; diff --git a/vis.c b/vis.c index 6de5c76..ddfdcd8 100644 --- a/vis.c +++ b/vis.c @@ -34,14 +34,14 @@ #define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) /* Checks if a sequence number x is a predecessor/successor of y. - they handle overflows/underflows and can correctly check for a - predecessor/successor unless the variable sequence number has grown by - more then 2**(bitwidth(x)-1)-1. - This means that for a uint8_t with the maximum value 255, it would think: - * when adding nothing - it is neither a predecessor nor a successor - * before adding more than 127 to the starting value - it is a predecessor, - * when adding 128 - it is neither a predecessor nor a successor, - * after adding more than 127 to the starting value - it is a successor */ + * they handle overflows/underflows and can correctly check for a + * predecessor/successor unless the variable sequence number has grown by + * more then 2**(bitwidth(x)-1)-1. + * This means that for a uint8_t with the maximum value 255, it would think: + * - when adding nothing - it is neither a predecessor nor a successor + * - before adding more than 127 to the starting value - it is a predecessor, + * - when adding 128 - it is neither a predecessor nor a successor, + * - after adding more than 127 to the starting value - it is a successor */ #define seq_before(x, y) ({typeof(x) _dummy = (x - y); \ _dummy > smallest_signed_int(_dummy); }) #define seq_after(x, y) seq_before(y, x) -- batman-adv

1 0

batctl; branch, master, updated. v2010.1.0-63-g58948f3
by postmaster＠open-mesh.net 12 Sep '10

12 Sep '10

The following commit has been merged in the master branch: commit 58948f3b3a673dd89c564e1721f2e0873e07c5e2 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Sun Sep 12 21:35:20 2010 +0200 batman-adv: checkpatch cleanup of comments checkpatch now detects the start of a comment and warns about usage of multiple spaces at the beginning of a line. We have to replace the ' ' in multiple lines comments by ' * ' to fix it. Checkpatch also wants a comment after a definition of a spinlock_t which describes what it protects. It is currently not possible to add it before the actual struct which includes the spinlock. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> diff --git a/packet.h b/packet.h index 87e652e..b49fdf7 100644 --- a/packet.h +++ b/packet.h @@ -81,7 +81,7 @@ struct icmp_packet { #define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet - as this is assumed by code that handles ICMP packets */ + * as this is assumed by code that handles ICMP packets */ struct icmp_packet_rr { uint8_t packet_type; uint8_t version; /* batman version field */ -- batctl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2010