diff mbox

[v2] batman-adv: Move definition of atomic_dec_not_zero() into main.h

Message ID 1303285976-28566-1-git-send-email-ordex@autistici.org (mailing list archive)
State Accepted, archived
Headers

Commit Message

Antonio Quartulli April 20, 2011, 7:52 a.m. UTC 
  atomic_dec_not_zero() is very useful and it is currently defined
multiple times. So it is possible to move it in main.h

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Acked-by: Sven Eckelmann <sven@narfation.org>
---
 aggregation.c |    1 -
 main.h        |    2 ++
 send.c        |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

Comments

Marek Lindner April 20, 2011, 11:13 a.m. UTC | #1 
On Wednesday 20 April 2011 09:52:56 Antonio Quartulli wrote:
> atomic_dec_not_zero() is very useful and it is currently defined
> multiple times. So it is possible to move it in main.h
> 
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> Acked-by: Sven Eckelmann <sven@narfation.org>

Applied in revision f9d05e.

Thanks,
Marek
diff mbox

Patch

diff --git a/aggregation.c b/aggregation.c
index af45d6b..c11788c 100644
--- a/aggregation.c
+++ b/aggregation.c
@@ -95,7 +95,6 @@  static bool can_aggregate_with(struct batman_packet *new_batman_packet,
 	return false;
 }
 
-#define atomic_dec_not_zero(v)          atomic_add_unless((v), -1, 0)
 /* create a new aggregated packet and add this packet to it */
 static void new_aggregated_packet(unsigned char *packet_buff, int packet_len,
 				  unsigned long send_time, bool direct_link,
diff --git a/main.h b/main.h
index a0059dd..101d9dc 100644
--- a/main.h
+++ b/main.h
@@ -177,4 +177,6 @@  static inline int compare_eth(void *data1, void *data2)
 	return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0);
 }
 
+#define atomic_dec_not_zero(v)	atomic_add_unless((v), -1, 0)
+
 #endif /* _NET_BATMAN_ADV_MAIN_H_ */
diff --git a/send.c b/send.c
index e78670c..7650e2b 100644
--- a/send.c
+++ b/send.c
@@ -393,7 +393,6 @@  static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
 			   send_time);
 }
 
-#define atomic_dec_not_zero(v)          atomic_add_unless((v), -1, 0)
 /* add a broadcast packet to the queue and setup timers. broadcast packets
  * are sent multiple times to increase probability for beeing received.
  *