commits June 2011

commits@lists.open-mesh.org

1 participants
58 discussions

batman-adv; branch, master, updated. v2011.1.0-145-gda04ca5
by postmaster＠open-mesh.org 09 Jun '11

09 Jun '11

The following commit has been merged in the master branch: commit da04ca5687925cba81d9783a76633b13379db0f9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 8 22:59:33 2011 +0200 batman-adv: Fix line over 80 characters Regression was introduced in 4d30670880c84071dba4b220f595e64d6c01d1ba. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/routing.c b/routing.c index 5e99188..7f458e9 100644 --- a/routing.c +++ b/routing.c @@ -728,7 +728,8 @@ void receive_bat_packet(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_mark(word, if_incoming_seqno - batman_packet->seqno - 2); + bit_mark(word, + if_incoming_seqno - batman_packet->seqno - 2); orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bit_packet_count(word); spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-144-g4591fc4
by postmaster＠open-mesh.org 09 Jun '11

09 Jun '11

The following commit has been merged in the master branch: commit 4591fc4f27c748a638eb03f62901928bf304d59d Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 8 22:33:53 2011 +0200 batman-adv: Remove cast after kmalloc Casting (void *) value returned by kmalloc is useless as mentioned in Documentation/CodingStyle, Chap 14. This regression was introduced in cea194d90b11aff7fc289149e4c7f305fad3535a Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/translation-table.c b/translation-table.c index d2a9f80..adecf1b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -148,8 +148,7 @@ static void tt_local_event(struct bat_priv *bat_priv, uint8_t op, { struct tt_change_node *tt_change_node; - tt_change_node = (struct tt_change_node *) - kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); + tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); if (!tt_change_node) return; -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-143-g9e80af2
by postmaster＠open-mesh.org 08 Jun '11

08 Jun '11

The following commit has been merged in the master branch: commit 4d30670880c84071dba4b220f595e64d6c01d1ba Author: Daniele Furlan <daniele.furlan(a)gmail.com> Date: Tue Jun 7 00:45:55 2011 +0200 batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load When a link is saturated (re)broadcasts of OGMs are delayed. Under heavy load this delay may exceed the orig interval which leads to OGMs being dropped (the code would only accept an OGM rebroadcast if it arrived before the next OGM was broadcasted). With this patch batman-adv will also accept delayed OGMs in order to avoid a bogus influence on the routing metric. Signed-off-by: Daniele Furlan <daniele.furlan(a)gmail.com> diff --git a/routing.c b/routing.c index c620d4f..5e99188 100644 --- a/routing.c +++ b/routing.c @@ -720,17 +720,15 @@ void receive_bat_packet(const struct ethhdr *ethhdr, /* neighbor has to indicate direct link and it has to * come via the corresponding interface */ - /* if received seqno equals last send seqno save new - * seqno for bidirectional check */ + /* save packet seqno for bidirectional check */ if (has_directlink_flag && compare_eth(if_incoming->net_dev->dev_addr, - batman_packet->orig) && - (batman_packet->seqno - if_incoming_seqno + 2 == 0)) { + batman_packet->orig)) { offset = if_incoming->if_num * NUM_WORDS; spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_mark(word, 0); + bit_mark(word, if_incoming_seqno - batman_packet->seqno - 2); orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bit_packet_count(word); spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-143-g9e80af2
by postmaster＠open-mesh.org 08 Jun '11

08 Jun '11

The following commit has been merged in the master branch: commit 9e80af2abed0a82794acfc1a58725b9090ca7980 Merge: 4d30670880c84071dba4b220f595e64d6c01d1ba 28f9e0e2b9ef07f741f62c93622ad214964f2041 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Jun 8 13:16:19 2011 +0200 Merge branch 'master' of git+ssh://batman-git/batman-adv -- batman-adv

1 0

batctl; branch, master, updated. v2011.1.0-29-g1c6d3d7
by postmaster＠open-mesh.org 08 Jun '11

08 Jun '11

The following commit has been merged in the master branch: commit 1c6d3d71dbd3b1711980cf109e02d179f68990d9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Jun 6 11:38:55 2011 +0200 batctl: tcpdump - display tt_crc field which is part of the OGM packet Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/tcpdump.c b/tcpdump.c index 85d461e..4e09274 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -315,15 +315,15 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); - printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", - get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), - ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttvn, - batman_packet->ttl, batman_packet->version, - (batman_packet->flags & DIRECTLINK ? 'D' : '.'), - (batman_packet->flags & VIS_SERVER ? 'V' : '.'), - (batman_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), - (batman_packet->gw_flags ? 'G' : '.'), - (size_t)buff_len - sizeof(struct ether_header)); + printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), + ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttvn, + ntohl(batman_packet->tt_crc), batman_packet->ttl, batman_packet->version, + (batman_packet->flags & DIRECTLINK ? 'D' : '.'), + (batman_packet->flags & VIS_SERVER ? 'V' : '.'), + (batman_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), + (batman_packet->gw_flags ? 'G' : '.'), + (size_t)buff_len - sizeof(struct ether_header)); } static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) -- batctl

1 0

batman-adv; branch, master, updated. v2011.1.0-141-g28f9e0e
by postmaster＠open-mesh.org 06 Jun '11

06 Jun '11

The following commit has been merged in the master branch: commit 28f9e0e2b9ef07f741f62c93622ad214964f2041 Author: Joe Perches <joe(a)perches.com> Date: Fri Jun 3 11:51:19 2011 +0000 batman-adv: Remove unnecessary semicolons Semicolons are not necessary after switch/while/for/if braces so remove them. Signed-off-by: Joe Perches <joe(a)perches.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/hard-interface.c b/hard-interface.c index 288d68e..cf972c3 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -563,7 +563,7 @@ static int hard_if_event(struct notifier_block *this, break; default: break; - }; + } hardif_put: hardif_free_ref(hard_iface); -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.1.0-108-gb2319d3
by postmaster＠open-mesh.org 06 Jun '11

06 Jun '11

The following commit has been merged in the next branch: commit b2319d364fe581d8e9f2565fe80717e3fa49445f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun May 15 00:50:21 2011 +0200 batman-adv: Use rcu_dereference_protected by update-side Usually rcu_dereference isn't necessary in situations were the RCU-protected data structure cannot change, but sparse and lockdep still need a similar functionality for analysis. rcu_dereference_protected implements the reduced version which should be used to support the dynamic and static analysis. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index e2844e9..c6af949 100644 --- a/compat.h +++ b/compat.h @@ -265,6 +265,8 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); pos && ({ prefetch(pos->next); 1; }); \ pos = rcu_dereference(hlist_next_rcu(pos))) +#define rcu_dereference_protected(p, c) (p) + #endif /* < KERNEL_VERSION(2, 6, 34) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) diff --git a/gateway_client.c b/gateway_client.c index 61605a0..b4014bf 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -86,7 +86,7 @@ static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node) if (new_gw_node && !atomic_inc_not_zero(&new_gw_node->refcount)) new_gw_node = NULL; - curr_gw_node = bat_priv->curr_gw; + curr_gw_node = rcu_dereference_protected(bat_priv->curr_gw, 1); rcu_assign_pointer(bat_priv->curr_gw, new_gw_node); if (curr_gw_node) diff --git a/hard-interface.c b/hard-interface.c index dfbfccc..676128a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -138,7 +138,7 @@ static void primary_if_select(struct bat_priv *bat_priv, if (new_hard_iface && !atomic_inc_not_zero(&new_hard_iface->refcount)) new_hard_iface = NULL; - curr_hard_iface = bat_priv->primary_if; + curr_hard_iface = rcu_dereference_protected(bat_priv->primary_if, 1); rcu_assign_pointer(bat_priv->primary_if, new_hard_iface); if (curr_hard_iface) diff --git a/soft-interface.c b/soft-interface.c index d5aa609..9c8f7b9 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -242,7 +242,8 @@ static void softif_neigh_vid_select(struct bat_priv *bat_priv, if (new_neigh && !atomic_inc_not_zero(&new_neigh->refcount)) new_neigh = NULL; - curr_neigh = softif_neigh_vid->softif_neigh; + curr_neigh = rcu_dereference_protected(softif_neigh_vid->softif_neigh, + 1); rcu_assign_pointer(softif_neigh_vid->softif_neigh, new_neigh); if ((curr_neigh) && (!new_neigh)) -- batman-adv

1 0

linux integration; annotated tag, v3.0-rc2, created. v3.0-rc2
by postmaster＠open-mesh.org 06 Jun '11

06 Jun '11

The annotated tag, v3.0-rc2 has been created at eb73a032155ba51adb229be1a2ad3ac08951b485 (tag) tagging 59c5f46fbe01a00eedf54a23789634438bb80603 (commit) replaces v3.0-rc1 tagged by Linus Torvalds on Mon Jun 6 18:07:10 2011 +0900 - Shortlog ------------------------------------------------------------ Linux 3.0-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk3smMMACgkQF3YsRnbiHLu/zQCfYKTyzJjoUZRLaFRLDDv9MEhj buQAn37wYEOO+n9Uux5i3EgkvnnD2SW0 =0C7C -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2011.1.0-28-g3a54a52
by postmaster＠open-mesh.org 06 Jun '11

06 Jun '11

The following commit has been merged in the master branch: commit 3a54a52114c991b3ddd7e7a451aafe9c32bab667 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 5 23:50:01 2011 +0200 batctl: Remove unused but set variable in roam and tt dump functions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/tcpdump.c b/tcpdump.c index 3e68844..85d461e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -253,12 +253,10 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct tt_query_packet *tt_query_packet; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct tt_query_packet), "BAT TT"); - ether_header = (struct ether_header *)packet_buff; tt_query_packet = (struct tt_query_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) @@ -280,12 +278,10 @@ static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int rea static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct roam_adv_packet *roam_adv_packet; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct roam_adv_packet), "BAT ROAM"); - ether_header = (struct ether_header *)packet_buff; roam_adv_packet = (struct roam_adv_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) -- batctl

1 0

batctl; branch, master, updated. v2011.1.0-27-ga9151d3
by postmaster＠open-mesh.org 05 Jun '11

05 Jun '11

The following commit has been merged in the master branch: commit b3a4f97fb7b11e50537bfae84561893418191b3e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Jun 4 18:36:33 2011 +0200 batctl: rename and move TT_* flags/structs to the proper locations struct tt_change is sent over the wire so need to be in packet.h as well as all the TT_CHANGE_* flags. TT_GLOBAL/CHANGE_ROAM as been renamed to TT_CLIENT_ROAM so that both tt_global_entry and tt_change can use the same same flag. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index ae212c7..5e3e778 100644 --- a/packet.h +++ b/packet.h @@ -54,11 +54,15 @@ #define UNI_FRAG_HEAD 0x01 #define UNI_FRAG_LARGETAIL 0x02 -/* TT flags */ +/* TT_QUERY flags */ #define TT_RESPONSE 0x01 #define TT_REQUEST 0x02 #define TT_FULL_TABLE 0x04 +/* TT_CHANGE flags */ +#define TT_CHANGE_DEL 0x01 +#define TT_CLIENT_ROAM 0x02 + struct batman_packet { uint8_t packet_type; uint8_t version; /* batman version field */ @@ -180,4 +184,9 @@ struct roam_adv_packet { uint8_t client[ETH_ALEN]; } __packed; +struct tt_change { + uint8_t flags; + uint8_t addr[ETH_ALEN]; +}; + #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2011