commits April 2012

commits@lists.open-mesh.org

1 participants
91 discussions

batctl; branch, next, updated. v2012.1.0-20-g25df17a
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the next branch: commit 25df17aa4da33cb101da7fdc749d7a1b4f05505d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Fri Apr 20 04:36:49 2012 +0800 batctl: fix man page originator entry Reported-by: Jo-Philipp Wich <jow(a)openwrt.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/man/batctl.8 b/man/batctl.8 index 036412b..4f2e1c6 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -59,7 +59,7 @@ protocol. If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to add or delete. .br .IP "\fBoriginators\fP|\fBo\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP][\fB\-t\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. The "\-t" option filters all originators that have not been seen for the specified amount of seconds (with optional decimal places) from the output. +Once started batctl will display the list of announced originators in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. The "\-t" option filters all originators that have not been seen for the specified amount of seconds (with optional decimal places) from the output. .br .IP "\fBinterval\fP|\fBit\fP [\fBorig_interval\fP]" If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. -- batctl

1 0

batman-adv; branch, master, updated. v2012.1.0-94-g88aa21d
by postmaster＠open-mesh.org 22 Apr '12

22 Apr '12

The following commit has been merged in the master branch: commit 88aa21d08c32c95b29a286bb95a6264de001c46c Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Apr 17 14:31:34 2012 +0200 batman-adv: fix typos in README.external Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/README.external b/README.external index 874ee7f..787172e 100644 --- a/README.external +++ b/README.external @@ -21,7 +21,7 @@ if you want to compile against some other kernel, use: # make KERNELPATH=/path/to/kernel -if you wont to install this module: +if you want to install this module: # sudo make install @@ -29,7 +29,7 @@ CONFIGURATION ------------- The in-kernel module can be configured through -menuconfig. When compiling outside of the kernel, tree it is +menuconfig. When compiling outside of the kernel tree, it is necessary to configure it using the make options. Each option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are -- batman-adv

1 0

linux integration; annotated tag, v3.4-rc4, created. v3.4-rc4
by postmaster＠open-mesh.org 21 Apr '12

21 Apr '12

The annotated tag, v3.4-rc4 has been created at 2263a9c8844371b175e061728bd7acb8fd188c4f (tag) tagging 66f75a5d028beaf67c931435fdc3e7823125730c (commit) replaces v3.4-rc3 tagged by Linus Torvalds on Sat Apr 21 14:48:02 2012 -0700 - Shortlog ------------------------------------------------------------ Linux 3.4-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPkysaAAoJEHm+PkMAQRiGw9cH/1cepvUZxu/gHZnmWX/FnL0y AlyYgC/kHnM4MRp6GRt7RxbnJhVHPmTDuyMS4uZI7IwBr66FZiuL2Ds3tuv5WwBY sN24G0plKsNTjQoNdaBsA/M84dLG71YfHehQUCx271huiAalIL3fNJnwNnJHyGQj 78evmV3/FhoTYISiX+nf18GEzggmU4a7UaQx64VWjkC5qcy8Q0TMLOaRe2QN7atE AfNYEMwtOlpHGfFA2SemfD8z4yTwjfmXYfwtqqxeUeLfl9iAh9qWfY6g9UEDAhce N1pqA11VNZg8nqUnGizA+p1Ja/lLjpoORYGCvCHrNVMzFnckFiIc/7CJJe/knkY= =6w68 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2012.1.0-93-g74b84f4
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The following commit has been merged in the master branch: commit 74b84f460614c6b04fc8e06083edc7af4ef1e7dd Merge: b0f3829d152db3dd98d0bcd894762e4a5788b135 a9f3b78bd28a3f876fc5ecbb1e0d65ff965f5f1e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Apr 18 17:28:02 2012 +0800 Merge branch 'next' diff --combined bat_iv_ogm.c index ed743a4,2a1845e..095aa64 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@@ -58,12 -58,12 +58,12 @@@ out static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; - unsigned long random_seqno; - int res = -1; + uint32_t random_seqno; + int res = -ENOMEM; /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(unsigned long)); - atomic_set(&hard_iface->seqno, (uint32_t)random_seqno); + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->seqno, random_seqno); hard_iface->packet_len = BATMAN_OGM_HLEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); @@@ -576,7 -576,8 +576,7 @@@ static void bat_iv_ogm_schedule(struct htonl((uint32_t)atomic_read(&hard_iface->seqno)); batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn); - batman_ogm_packet->tt_crc = htons((uint16_t) - atomic_read(&bat_priv->tt_crc)); + batman_ogm_packet->tt_crc = htons(bat_priv->tt_crc); if (tt_num_changes >= 0) batman_ogm_packet->tt_num_changes = tt_num_changes; -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-86-ga9f3b78
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The following commit has been merged in the next branch: commit a9f3b78bd28a3f876fc5ecbb1e0d65ff965f5f1e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 18 09:40:40 2012 +0200 batman-adv: use real error codes instead of meaningless -1 Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index ab2085c..2a1845e 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -59,7 +59,7 @@ static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; uint32_t random_seqno; - int res = -1; + int res = -ENOMEM; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(random_seqno)); diff --git a/hard-interface.c b/hard-interface.c index e647a43..843caa7 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -309,10 +309,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface, bat_priv = netdev_priv(hard_iface->soft_iface); ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); - if (ret < 0) { - ret = -ENOMEM; + if (ret < 0) goto err_dev; - } hard_iface->if_num = bat_priv->num_ifaces; bat_priv->num_ifaces++; -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-85-g69a69a4
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The following commit has been merged in the next branch: commit 69a69a4a89b14b19197b9119259a33c076202b77 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 18 09:35:13 2012 +0200 batman-adv: use uint32_t instead of unsigned long to avoid cast Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 994369d..ab2085c 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -58,12 +58,12 @@ out: static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; - unsigned long random_seqno; + uint32_t random_seqno; int res = -1; /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(unsigned long)); - atomic_set(&hard_iface->seqno, (uint32_t)random_seqno); + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->seqno, random_seqno); hard_iface->packet_len = BATMAN_OGM_HLEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); -- batman-adv

1 0

linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The annotated tag, batman-adv-for-davem has been created at 21d78a97fc4ed3eda415dde2f6483f3b32babd04 (tag) tagging 1e5cc266dbc401d11aefb966ad35e651c2f67414 (commit) replaces v3.4-rc2 tagged by Antonio Quartulli on Wed Apr 18 10:02:33 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: * remove duplicated line in comment * add htons() invocation for tt_crc as suggested by Al Viro * OriGinator Message seqno initial value is now random * some cleanups and fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPjnVmAAoJEFMQTLzJFOZFqpkH/33gzND7Ukfdax6CPYqb1AVm A63gtnZlNCwPf7dCJkq4yF4RVn/ir1pp+BwX5C9BIN9V/ZSaTsIKsMXAaZzUK3DH PCZEJCn+iys+ZX5KrpLum0wMSQyxt08GsGZLueiu+Rm0zRZLSCy58THNqLt2b6ZK mDH6tdbGxKXxrKeWzVz3PzQv8dPuFqApPiQ+M6ugf4YvjdYYEiGWFn8gad+XObeA oxbFGMt6MKdc+9EsKqd0Br1lqHiQ+RC2xXQiFEBizPe34LiYJ69irkEBki/6KV9Z ujeB0RxlMHXL75vUWoqyGcv/F2lzZd/tXQA6qz7ioCBHqzb1Mk/KGmVJ3KZ5CK8= =9lku -----END PGP SIGNATURE----- Antonio Quartulli (7): batman-adv: clean up Kconfig batman-adv: use ETH_ALEN instead of hardcoded numeric constants batman-adv: convert the tt_crc to network order batman-adv: remove duplicated line in comment batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr) batman-adv: print OGM seq numbers as unsigned int batman-adv: skip the window protection test when the originator has no neighbours Eric Dumazet (1): net: cleanup unsigned to unsigned int Marek Lindner (9): batman-adv: encourage batman to take shorter routes by changing the default hop penalty batman-adv: move ogm initialization into the proper function batman-adv: refactoring API: find generalized name for bat_ogm_init callback batman-adv: randomize initial seqno to avoid collision batman-adv: add iface_disable() callback to routing API batman-adv: handle routing code initialization properly batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN batman-adv: mark existing ogm variables as batman iv Simon Wunderlich (10): batman-adv: remove old bridge loop avoidance code batman-adv: add basic bridge loop avoidance code batman-adv: make bridge loop avoidance switchable batman-adv: export claim tables through debugfs batman-adv: allow multiple entries in tt_global_entries batman-adv: don't let backbone gateways exchange tt entries batman-adv: add broadcast duplicate check batman-adv: drop STP over batman batman-adv: form groups in the bridge loop avoidance batman-adv: add bridge loop avoidance compile option Sven Eckelmann (2): batman-adv: Replace bitarray operations with bitmap batman-adv: Remove declaration of only locally used functions ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.4-rc2-616-g520ada6
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The annotated tag, batman-adv-for-davem has been deleted was 4087d5abade32721bc779005d38e9e65cfb5c259 ----------------------------------------------------------------------- tag batman-adv-for-davem Included changes: * several cleanups and fixes * OriGinator Message seqno initial value is now random -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJPjVVWAAoJEFMQTLzJFOZF5QEH/A3a33aYa36LFduiOUuIJHQc fuaEBz5TEQUzQFOUcvkT00K/4r9/4cuLJmob8kMAnBTu5jOlJNZXLgoFP0+9In8i iCKYBUKFLN+hyLHp/NSJn2a/fgQfJuNZDh2WSu3gRBzzwWnAUFlVemjOPmkK1/lg NQNe08TchQlwJ5PPDlzQcQAUDPnwTTCjOStMaxl5O6dFym8bXrWtoqjgQRb3Irl6 Z4Lqsr4rBK2928XIvjLqW1Chprc49MWQlyb7jokdGYf7FFZaLXnjzvI25dG9SHiI G6t7HLyDEToO41jW/l9InVzU/Xz+z7vIy0vw+v82twerl07imJ4+/Mr/PcOik0w= =J4lh -----END PGP SIGNATURE----- 520ada6df73ab595f7d51378b9df937371f13460 batman-adv: skip the window protection test when the originator has no neighbours ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.4-rc1-1903-g00b4327
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The following commit has been merged in the merge/master branch: commit 00b432758ad02ae42137dd414d4346843c4f3b77 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 18 09:47:57 2012 +0200 batman-adv: remove duplicated line in comment Remove an accidentally added duplicated line in a function comment Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0359952..8bf9751 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -733,7 +733,6 @@ static int handle_claim(struct bat_priv *bat_priv, /** * @bat_priv: the bat priv with all the soft interface information - * @bat_priv: the bat priv with all the soft interface information * @hw_src: the Hardware source in the ARP Header * @hw_dst: the Hardware destination in the ARP Header * @ethhdr: pointer to the Ethernet header of the claim frame -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.4-rc1-1902-gb749531
by postmaster＠open-mesh.org 18 Apr '12

18 Apr '12

The following commit has been merged in the merge/master branch: commit b7495314edf39af6da9b22d1ecde2c7d5207eb5b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Apr 14 13:15:27 2012 +0200 batman-adv: convert the tt_crc to network order Before sending out a TT_Request packet we must convert the tt_crc field value to network order (since it is 16bits long). Reported-by: Al Viro <viro(a)ZenIV.linux.org.uk> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 72dfbe1..88e4c8e 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1341,7 +1341,7 @@ static int send_tt_request(struct bat_priv *bat_priv, memcpy(tt_request->dst, dst_orig_node->orig, ETH_ALEN); tt_request->header.ttl = TTL; tt_request->ttvn = ttvn; - tt_request->tt_data = tt_crc; + tt_request->tt_data = htons(tt_crc); tt_request->flags = TT_REQUEST; if (full_table) -- linux integration

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2012