commits May 2011

commits@lists.open-mesh.org

1 participants
84 discussions

batman-adv; branch, master, updated. v2011.1.0-101-g4560a65

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 4560a6550c3613479e32a0c8816341b55a382967 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 14 23:14:46 2011 +0200 batman-adv: Annotate functions with format strings Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bat_debugfs.c b/bat_debugfs.c index abaeec5..4577d3f 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -50,6 +50,7 @@ static void emit_log_char(struct debug_log *debug_log, char c) debug_log->log_start = debug_log->log_end - log_buff_len; } +__printf(2, 3) static int fdebug_log(struct debug_log *debug_log, char *fmt, ...) { va_list args; diff --git a/main.h b/main.h index 3ca3941..f80954b 100644 --- a/main.h +++ b/main.h @@ -138,7 +138,7 @@ void dec_module_count(void); int is_my_mac(uint8_t *addr); #ifdef CONFIG_BATMAN_ADV_DEBUG -int debug_log(struct bat_priv *bat_priv, char *fmt, ...); +int debug_log(struct bat_priv *bat_priv, char *fmt, ...) __printf(2, 3); #define bat_dbg(type, bat_priv, fmt, arg...) \ do { \ @@ -147,6 +147,7 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ +__printf(3, 4) static inline void bat_dbg(char type __always_unused, struct bat_priv *bat_priv __always_unused, char *fmt __always_unused, ...) -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-102-ge19eec3

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit e19eec39f76a2716a5737146acf875c02bde68c0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat May 14 19:57:21 2011 +0200 batman-adv: reset broadcast flood protection on error The broadcast flood protection should be reset to its original value if the primary interface could not be retrieved. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/send.c b/send.c index 76daa46..3377927 100644 --- a/send.c +++ b/send.c @@ -421,7 +421,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb) primary_if = primary_if_get_selected(bat_priv); if (!primary_if) - goto out; + goto out_and_inc; forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC); -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-100-g49eb173

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 49eb1730c1d2f47c28184f8e367a4d9b2fa1a94b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat May 14 19:57:21 2011 +0200 batman-adv: reset broadcast flood protection on error The broadcast flood protection should be reset to its original value if the primary interface could not be retrieved. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/send.c b/send.c index 76daa46..3377927 100644 --- a/send.c +++ b/send.c @@ -421,7 +421,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb) primary_if = primary_if_get_selected(bat_priv); if (!primary_if) - goto out; + goto out_and_inc; forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC); -- batman-adv

11 years, 10 months

linux integration; branch, merge/master, updated. v2.6.39-rc3-995-g4f4e422

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 4f4e422040fa28dced95234958bcbbddb6404f60 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat May 14 20:01:22 2011 +0200 batman-adv: reset broadcast flood protection on error The broadcast flood protection should be reset to its original value if the primary interface could not be retrieved. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 76daa46..3377927 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -421,7 +421,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb) primary_if = primary_if_get_selected(bat_priv); if (!primary_if) - goto out; + goto out_and_inc; forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC); -- linux integration

11 years, 10 months

linux integration; branch, merge/master, updated. v2.6.39-rc3-995-g4f4e422

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 6355683d1c5ef25c15bc136fa85e52e8de05e964 Merge: b42df0b92d8773f80564751f7fbdbce824ea1290 d5bbce8465af90351295903da8327101409401aa Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 14 23:49:17 2011 +0200 Merge remote-tracking branch 'origin/standalone/next' into merge/master Conflicts: net/batman-adv/compat.c diff --combined net/batman-adv/aggregation.c index 9b94590,a8c3203..a8c3203 --- a/net/batman-adv/aggregation.c +++ b/net/batman-adv/aggregation.c @@@ -23,6 -23,7 +23,7 @@@ #include "aggregation.h" #include "send.h" #include "routing.h" + #include "hard-interface.h" /* calculate the size of the tt information for a given packet */ static int tt_len(struct batman_packet *batman_packet) @@@ -105,12 -106,15 +106,15 @@@ static void new_aggregated_packet(unsig struct forw_packet *forw_packet_aggr; unsigned char *skb_buff; + if (!atomic_inc_not_zero(&if_incoming->refcount)) + return; + /* own packet should always be scheduled */ if (!own_packet) { if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) { bat_dbg(DBG_BATMAN, bat_priv, "batman packet queue full\n"); - return; + goto out; } } @@@ -118,7 -122,7 +122,7 @@@ if (!forw_packet_aggr) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); - return; + goto out; } if ((atomic_read(&bat_priv->aggregated_ogms)) && @@@ -133,7 -137,7 +137,7 @@@ if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); kfree(forw_packet_aggr); - return; + goto out; } skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr)); @@@ -164,6 -168,10 +168,10 @@@ queue_delayed_work(bat_event_workqueue, &forw_packet_aggr->delayed_work, send_time - jiffies); + + return; + out: + hardif_free_ref(if_incoming); } /* aggregate a new packet into the existing aggregation */ diff --combined net/batman-adv/send.c index f30d0c6,76daa46..76daa46 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@@ -377,6 -377,8 +377,8 @@@ static void forw_packet_free(struct for { if (forw_packet->skb) kfree_skb(forw_packet->skb); + if (forw_packet->if_incoming) + hardif_free_ref(forw_packet->if_incoming); kfree(forw_packet); } @@@ -539,6 -541,7 +541,7 @@@ void purge_outstanding_packets(struct b { struct forw_packet *forw_packet; struct hlist_node *tmp_node, *safe_tmp_node; + bool pending; if (hard_iface) bat_dbg(DBG_BATMAN, bat_priv, @@@ -567,8 -570,13 +570,13 @@@ * send_outstanding_bcast_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bcast_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bcast_list_lock); @@@ -591,8 -599,13 +599,13 @@@ * send_outstanding_bat_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bat_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bat_list_lock); } -- linux integration

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-101-gd5bbce8

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit d5bbce8465af90351295903da8327101409401aa Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed May 11 20:59:06 2011 +0200 batman-adv: Add missing hardif_free_ref in forw_packet_free add_bcast_packet_to_list increases the refcount for if_incoming but the reference count is never decreased. The reference count must be increased for all kinds of forwarded packets which have the primary interface stored and forw_packet_free must decrease them. Also purge_outstanding_packets has to invoke forw_packet_free when a work item was really cancelled. This was a regression introduced by 89079aec4c0c2c60a3a2561afcce62538cebd71d. Reported-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/aggregation.c b/aggregation.c index 9b94590..a8c3203 100644 --- a/aggregation.c +++ b/aggregation.c @@ -23,6 +23,7 @@ #include "aggregation.h" #include "send.h" #include "routing.h" +#include "hard-interface.h" /* calculate the size of the tt information for a given packet */ static int tt_len(struct batman_packet *batman_packet) @@ -105,12 +106,15 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, struct forw_packet *forw_packet_aggr; unsigned char *skb_buff; + if (!atomic_inc_not_zero(&if_incoming->refcount)) + return; + /* own packet should always be scheduled */ if (!own_packet) { if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) { bat_dbg(DBG_BATMAN, bat_priv, "batman packet queue full\n"); - return; + goto out; } } @@ -118,7 +122,7 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, if (!forw_packet_aggr) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); - return; + goto out; } if ((atomic_read(&bat_priv->aggregated_ogms)) && @@ -133,7 +137,7 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); kfree(forw_packet_aggr); - return; + goto out; } skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr)); @@ -164,6 +168,10 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, queue_delayed_work(bat_event_workqueue, &forw_packet_aggr->delayed_work, send_time - jiffies); + + return; +out: + hardif_free_ref(if_incoming); } /* aggregate a new packet into the existing aggregation */ diff --git a/send.c b/send.c index f30d0c6..76daa46 100644 --- a/send.c +++ b/send.c @@ -377,6 +377,8 @@ static void forw_packet_free(struct forw_packet *forw_packet) { if (forw_packet->skb) kfree_skb(forw_packet->skb); + if (forw_packet->if_incoming) + hardif_free_ref(forw_packet->if_incoming); kfree(forw_packet); } @@ -539,6 +541,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, { struct forw_packet *forw_packet; struct hlist_node *tmp_node, *safe_tmp_node; + bool pending; if (hard_iface) bat_dbg(DBG_BATMAN, bat_priv, @@ -567,8 +570,13 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, * send_outstanding_bcast_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bcast_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bcast_list_lock); @@ -591,8 +599,13 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, * send_outstanding_bat_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bat_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bat_list_lock); } -- batman-adv

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-99-gd18e485

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit d18e485761814e3edb34d32dbc358a6c2f59b0ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed May 11 20:59:06 2011 +0200 batman-adv: Add missing hardif_free_ref in forw_packet_free add_bcast_packet_to_list increases the refcount for if_incoming but the reference count is never decreased. The reference count must be increased for all kinds of forwarded packets which have the primary interface stored and forw_packet_free must decrease them. Also purge_outstanding_packets has to invoke forw_packet_free when a work item was really cancelled. This was a regression introduced by 89079aec4c0c2c60a3a2561afcce62538cebd71d. Reported-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/aggregation.c b/aggregation.c index 9b94590..a8c3203 100644 --- a/aggregation.c +++ b/aggregation.c @@ -23,6 +23,7 @@ #include "aggregation.h" #include "send.h" #include "routing.h" +#include "hard-interface.h" /* calculate the size of the tt information for a given packet */ static int tt_len(struct batman_packet *batman_packet) @@ -105,12 +106,15 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, struct forw_packet *forw_packet_aggr; unsigned char *skb_buff; + if (!atomic_inc_not_zero(&if_incoming->refcount)) + return; + /* own packet should always be scheduled */ if (!own_packet) { if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) { bat_dbg(DBG_BATMAN, bat_priv, "batman packet queue full\n"); - return; + goto out; } } @@ -118,7 +122,7 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, if (!forw_packet_aggr) { if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); - return; + goto out; } if ((atomic_read(&bat_priv->aggregated_ogms)) && @@ -133,7 +137,7 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, if (!own_packet) atomic_inc(&bat_priv->batman_queue_left); kfree(forw_packet_aggr); - return; + goto out; } skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr)); @@ -164,6 +168,10 @@ static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, queue_delayed_work(bat_event_workqueue, &forw_packet_aggr->delayed_work, send_time - jiffies); + + return; +out: + hardif_free_ref(if_incoming); } /* aggregate a new packet into the existing aggregation */ diff --git a/send.c b/send.c index f30d0c6..76daa46 100644 --- a/send.c +++ b/send.c @@ -377,6 +377,8 @@ static void forw_packet_free(struct forw_packet *forw_packet) { if (forw_packet->skb) kfree_skb(forw_packet->skb); + if (forw_packet->if_incoming) + hardif_free_ref(forw_packet->if_incoming); kfree(forw_packet); } @@ -539,6 +541,7 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, { struct forw_packet *forw_packet; struct hlist_node *tmp_node, *safe_tmp_node; + bool pending; if (hard_iface) bat_dbg(DBG_BATMAN, bat_priv, @@ -567,8 +570,13 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, * send_outstanding_bcast_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bcast_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bcast_list_lock); @@ -591,8 +599,13 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, * send_outstanding_bat_packet() will lock the list to * delete the item from the list */ - cancel_delayed_work_sync(&forw_packet->delayed_work); + pending = cancel_delayed_work_sync(&forw_packet->delayed_work); spin_lock_bh(&bat_priv->forw_bat_list_lock); + + if (pending) { + hlist_del(&forw_packet->list); + forw_packet_free(forw_packet); + } } spin_unlock_bh(&bat_priv->forw_bat_list_lock); } -- batman-adv

11 years, 10 months

linux integration; annotated tag, v2.6.39-rc7, created. v2.6.39-rc7

by postmaster＠open-mesh.org

The annotated tag, v2.6.39-rc7 has been created at 2c2138749b9dc99a1f26b212eb373458ea179e06 (tag) tagging 693d92a1bbc9e42681c42ed190bd42b636ca876f (commit) replaces v2.6.39-rc6 tagged by Linus Torvalds on Mon May 9 19:34:05 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 2.6.39-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk3IpCcACgkQF3YsRnbiHLvwvwCeO4Bb/W10gK9NyDmI8DxHOCMu sxAAn00hVXuP7MDQg2bGUUlp2ac0wlTN =NyZ5 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

11 years, 10 months

batman-adv; branch, master, updated. v2011.1.0-98-g4d4cd85

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 4d4cd85635fdfbd91cf48664c9770860012f6393 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue May 10 11:17:40 2011 +0200 batman-adv: Use kzalloc rather than kmalloc followed by memset with 0 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/gateway_client.c b/gateway_client.c index 65f3953..e638841 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -281,11 +281,10 @@ static void gw_node_add(struct bat_priv *bat_priv, struct gw_node *gw_node; int down, up; - gw_node = kmalloc(sizeof(struct gw_node), GFP_ATOMIC); + gw_node = kzalloc(sizeof(struct gw_node), GFP_ATOMIC); if (!gw_node) return; - memset(gw_node, 0, sizeof(struct gw_node)); INIT_HLIST_NODE(&gw_node->list); gw_node->orig_node = orig_node; atomic_set(&gw_node->refcount, 1); -- batman-adv

11 years, 10 months

batman-adv; branch, next, updated. v2011.1.0-100-g7eaf03c

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 7eaf03c7c6bc118a9ce704d59b11d13b4c09cd82 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 9 10:15:32 2011 +0200 batman-adv: Fix build with linux 2.6.25-2.6.27 We must prevent that IPPROTO_UDP gets redefined using compat.h. Otherwise the build will fail when including things like net/addrconf.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.c b/compat.c index 70de376..586898f 100644 --- a/compat.c +++ b/compat.c @@ -1,3 +1,4 @@ +#include <linux/in.h> #include <linux/version.h> #include "main.h" -- batman-adv

11 years, 10 months

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

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2011