From afee3cc742083d7a31cd660bf841d3ea15d0d5d3 Mon Sep 17 00:00:00 2001
From: Antonio Quartulli <ordex@autistici.org>
Date: Wed, 20 Apr 2011 09:52:56 +0200
Subject: [PATCH] --- yaml --- r: 247045 b: refs/heads/master c:
 5f657ec0d2103571a31707711926b443a27b0c66 h: refs/heads/master i:   247043:
 ce239dea5cf8fd3b373fa6df60453641d12b7f6a v: v3

---
 [refs]                             | 2 +-
 trunk/net/batman-adv/aggregation.c | 1 -
 trunk/net/batman-adv/main.h        | 2 ++
 trunk/net/batman-adv/send.c        | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bd2bf9ed0ef4..7d645bee825a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5a6f69c5ca024bea43496d517c3b7ccfdb084a6
+refs/heads/master: 5f657ec0d2103571a31707711926b443a27b0c66
diff --git a/trunk/net/batman-adv/aggregation.c b/trunk/net/batman-adv/aggregation.c
index af45d6b2031f..c11788c4c1a1 100644
--- a/trunk/net/batman-adv/aggregation.c
+++ b/trunk/net/batman-adv/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/trunk/net/batman-adv/main.h b/trunk/net/batman-adv/main.h
index dc248697de71..ace72852ed7b 100644
--- a/trunk/net/batman-adv/main.h
+++ b/trunk/net/batman-adv/main.h
@@ -175,4 +175,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/trunk/net/batman-adv/send.c b/trunk/net/batman-adv/send.c
index e78670c3c4b7..7650e2bf187d 100644
--- a/trunk/net/batman-adv/send.c
+++ b/trunk/net/batman-adv/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.
  *