commits November 2015

commits@lists.open-mesh.org

1 participants
68 discussions

[batman-adv] master: batman-adv: fix kerneldoc for TT functions (dbc613c)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit dbc613ce1e57eb98f9265280f55aad090f2bce2a Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Nov 17 16:40:52 2015 +0800 batman-adv: fix kerneldoc for TT functions Cc: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- dbc613ce1e57eb98f9265280f55aad090f2bce2a net/batman-adv/translation-table.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index c02f68e..9114dad 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -69,9 +69,13 @@ static void batadv_tt_global_del(struct batadv_priv *bat_priv, bool roaming); /** - * batadv_compare_tt + * batadv_compare_tt - check if two TT entries are the same + * @node: the list element pointer of the first TT entry + * @data2: pointer to the tt_common_entry of the second TT entry * - * Return: 1 if they are the same mac addr and vid + * Compare the MAC address and the VLAN ID of the two TT entries and check if + * they are the same TT client. + * Return: 1 if the two TT clients are the same, 0 otherwise */ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { @@ -221,6 +225,7 @@ batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry) /** * batadv_tt_global_hash_count - count the number of orig entries + * @bat_priv: the bat priv with all the soft interface information * @addr: the mac address of the client to count entries for * @vid: VLAN identifier * @@ -303,8 +308,9 @@ static void batadv_tt_local_size_dec(struct batadv_priv *bat_priv, } /** - * batadv_tt_global_size_mod - change the size by v of the local table - * identified by vid + * batadv_tt_global_size_mod - change the size by v of the global table + * for orig_node identified by vid + * @orig_node: the originator for which the table has to be modified * @vid: the VLAN identifier * @v: the amount to sum to the global table size */ @@ -723,7 +729,6 @@ out: * function reserves the amount of space needed to send the entire global TT * table. In case of success the value is updated with the real amount of * reserved bytes - * Allocate the needed amount of memory for the entire TT TVLV and write its * header made up by one tvlv_tt_data object and a series of tvlv_tt_vlan_data * objects, one per active VLAN served by the originator node. @@ -1245,9 +1250,12 @@ static void batadv_tt_changes_list_free(struct batadv_priv *bat_priv) } /** - * batadv_tt_global_orig_entry_find + * batadv_tt_global_orig_entry_find - find a TT orig_list_entry + * @entry: the TT global entry where the orig_list_entry has to be + * extracted from + * @orig_node: the originator for which the orig_list_entry has to be found * - * retrieves the orig_tt_list_entry belonging to orig_node from the + * retrieve the orig_tt_list_entry belonging to orig_node from the * batadv_tt_global_entry list * * Return: it with an increased refcounter, NULL if not found @@ -1276,7 +1284,10 @@ batadv_tt_global_orig_entry_find(const struct batadv_tt_global_entry *entry, } /** - * batadv_tt_global_entry_has_orig + * batadv_tt_global_entry_has_orig - check if a TT global entry is also handled + * by a given originator + * @entry: the TT global entry to check + * @orig_node: the originator to search in the list * * find out if an orig_node is already in the list of a tt_global_entry. * @@ -2521,6 +2532,8 @@ static void batadv_tt_global_update_crc(struct batadv_priv *bat_priv, * @num_vlan: number of tvlv VLAN entries * @full_table: ask for the entire translation table if true, while only for the * last TT diff otherwise + * + * Return: true if the TT Request was sent, false otherwise */ static int batadv_send_tt_request(struct batadv_priv *bat_priv, struct batadv_orig_node *dst_orig_node, @@ -3064,7 +3077,9 @@ static void batadv_tt_roam_purge(struct batadv_priv *bat_priv) } /** - * batadv_tt_check_roam_count + * batadv_tt_check_roam_count - check if a client has roamed too frequently + * @bat_priv: the bat priv with all the soft interface information + * @client: mac address of the roaming client * * This function checks whether the client already reached the * maximum number of possible roaming phases. In this case the ROAMING_ADV

1 0

[batman-adv] master: batman-adv: fix kerneldoc for DAT functions (53aa898)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 53aa898a2791af4dbb757c81f297f50623def2f7 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Tue Nov 17 16:40:51 2015 +0800 batman-adv: fix kerneldoc for DAT functions Cc: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 53aa898a2791af4dbb757c81f297f50623def2f7 net/batman-adv/distributed-arp-table.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 2f13429..60df823 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -741,6 +741,8 @@ static void batadv_dat_hash_free(struct batadv_priv *bat_priv) /** * batadv_dat_init - initialise the DAT internals * @bat_priv: the bat priv with all the soft interface information + * + * Return: 0 in case of success, a negative error code otherwise */ int batadv_dat_init(struct batadv_priv *bat_priv) { @@ -779,6 +781,8 @@ void batadv_dat_free(struct batadv_priv *bat_priv) * batadv_dat_cache_seq_print_text - print the local DAT hash table * @seq: seq file to print on * @offset: not used + * + * Return: always 0 */ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) {

1 0

[batctl] master: batctl: Fix kerneldoc of main functions (2dddf83)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 2dddf839a47e65c50c43ee96ec9dc94a6581bcd8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Oct 31 12:29:29 2015 +0100 batctl: Fix kerneldoc of main functions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2dddf839a47e65c50c43ee96ec9dc94a6581bcd8 packet.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packet.h b/packet.h index 72fd5b0..fdb0163 100644 --- a/packet.h +++ b/packet.h @@ -209,6 +209,11 @@ struct batadv_bla_claim_dst { * @version: batman-adv protocol version, part of the genereal header * @ttl: time to live for this packet, part of the genereal header * @flags: contains routing relevant flags - see enum batadv_iv_flags + * @seqno: sequence identification + * @orig: address of the source node + * @prev_sender: address of the previous sender + * @reserved: reserved byte for alignment + * @tq: transmission quality * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { @@ -345,6 +350,7 @@ struct batadv_unicast_packet { * @u: common unicast packet header * @src: address of the source * @subtype: packet subtype + * @reserved: reserved byte for alignment */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u;

1 0

[batman-adv] master's head updated: Merge branch 'next' (c881441)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 5019fc0 batman-adv: Fix variable declaration warning in batadv_compare_tt 1ed6b1f Merge branch 'maint' into next c881441 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (c881441)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c88144124d34e69793c0d760d5d5a9305231d13d Merge: 4c652b9 1ed6b1f Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Nov 18 16:44:28 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- c88144124d34e69793c0d760d5d5a9305231d13d net/batman-adv/translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (1ed6b1f)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 5019fc0 batman-adv: Fix variable declaration warning in batadv_compare_tt 1ed6b1f Merge branch 'maint' into next

1 0

[batman-adv] next: Merge branch 'maint' into next (1ed6b1f)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 1ed6b1fc32cba57778a84b85dc1257838cbe3288 Merge: c96b7dc 5019fc0 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Nov 18 16:44:09 2015 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 1ed6b1fc32cba57778a84b85dc1257838cbe3288 net/batman-adv/translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[batman-adv] maint: batman-adv: Fix variable declaration warning in batadv_compare_tt (5019fc0)
by postmaster＠open-mesh.org 18 Nov '15

18 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 5019fc0faac0d8f0b377dbc7d27a3899c45237c3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 18 09:41:41 2015 +0100 batman-adv: Fix variable declaration warning in batadv_compare_tt checkpatch is warning about the wrong way a pointer is declared in batadv_compare_tt. ERROR: "foo* bar" should be "foo *bar" #80: FILE: ./net/batman-adv/translation-table.c:80: + const struct batadv_tt_common_entry* tt1 = data1; Fixes: af5fa950cbb6 ("batman-adv: fix erroneous client entry duplicate detection") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5019fc0faac0d8f0b377dbc7d27a3899c45237c3 net/batman-adv/translation-table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 77290cd..a7d9997 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -72,8 +72,8 @@ static int batadv_compare_tt(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_tt_common_entry, hash_entry); - const struct batadv_tt_common_entry* tt1 = data1; - const struct batadv_tt_common_entry* tt2 = data2; + const struct batadv_tt_common_entry *tt1 = data1; + const struct batadv_tt_common_entry *tt2 = data2; return (tt1->vid == tt2->vid) && batadv_compare_eth(data1, data2); }

1 0

[batman-adv] master: batman-adv: Change ifconfig examples to iproute2 (4c652b9)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4c652b932088993cf916a28477820e0f814558ac Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 28 10:58:00 2015 +0100 batman-adv: Change ifconfig examples to iproute2 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4c652b932088993cf916a28477820e0f814558ac Documentation/networking/batman-adv.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 58e4904..ff23b75 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -115,14 +115,17 @@ The "bat0" interface can be used like any other regular inter- face. It needs an IP address which can be either statically con- figured or dynamically (by using DHCP or similar services): -# NodeA: ifconfig bat0 192.168.0.1 -# NodeB: ifconfig bat0 192.168.0.2 +# NodeA: ip link set up dev bat0 +# NodeA: ip addr add 192.168.0.1/24 dev bat0 + +# NodeB: ip link set up dev bat0 +# NodeB: ip addr add 192.168.0.2/24 dev bat0 # NodeB: ping 192.168.0.1 Note: In order to avoid problems remove all IP addresses previ- ously assigned to interfaces now used by batman advanced, e.g. -# ifconfig eth0 0.0.0.0 +# ip addr flush dev eth0 LOGGING/DEBUGGING

1 0

[batman-adv] master's head updated: Merge branch 'next' (f4b76a0)
by postmaster＠open-mesh.org 17 Nov '15

17 Nov '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e897e5e batman-adv: Fix invalid stack access in batadv_dat_select_candidates c96b7dc Merge branch 'maint' into next f4b76a0 Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2015