batctl; branch, next, updated. v2010.2.0-84-g213ec1b - commits - lists.open-mesh.org

16 Jan 2011

The following commit has been merged in the next branch:
commit 213ec1b7ccd5cb72f382bc75f2157d46cde0d20b
Author: Sven Eckelmann sven@narfation.org
Date:   Sat Jan 15 14:39:43 2011 +0100
batman-adv: Use "__attribute__" shortcut macros
Linux 2.6.21 defines different macros for __attribute__ which are also
    used inside batman-adv. The next version of checkpatch.pl warns about
    the usage of __attribute__((packed))).
Linux 2.6.33 defines an extra macro __always_unused which is used to
    assist source code analyzers and can be used to removed the last
    existing __attribute__ inside the source code.
Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/main.h b/main.h
index f45fec0..ae05c69 100644
--- a/main.h
+++ b/main.h
@@ -24,3 +24,5 @@
 #define SOURCE_VERSION "next"
#define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"
+
+#define __packed __attribute((packed))   /* linux kernel compat */
diff --git a/packet.h b/packet.h
index b49fdf7..2284e81 100644
--- a/packet.h
+++ b/packet.h
@@ -63,7 +63,7 @@ struct batman_packet {
    uint8_t  num_hna;
    uint8_t  gw_flags;  /* flags related to gateway class */
    uint8_t  align;
-} __attribute__((packed));
+} __packed;
#define BAT_PACKET_LEN sizeof(struct batman_packet)
@@ -76,7 +76,7 @@ struct icmp_packet {
    uint8_t  orig[6];
    uint16_t seqno;
    uint8_t  uid;
-} __attribute__((packed));
+} __packed;
#define BAT_RR_LEN 16
@@ -93,14 +93,14 @@ struct icmp_packet_rr {
    uint8_t  uid;
    uint8_t  rr_cur;
    uint8_t  rr[BAT_RR_LEN][ETH_ALEN];
-} __attribute__((packed));
+} __packed;
struct unicast_packet {
    uint8_t  packet_type;
    uint8_t  version;  /* batman version field */
    uint8_t  dest[6];
    uint8_t  ttl;
-} __attribute__((packed));
+} __packed;
struct unicast_frag_packet {
    uint8_t  packet_type;
@@ -110,7 +110,7 @@ struct unicast_frag_packet {
    uint8_t  flags;
    uint8_t  orig[6];
    uint16_t seqno;
-} __attribute__((packed));
+} __packed;
struct bcast_packet {
    uint8_t  packet_type;
@@ -118,7 +118,7 @@ struct bcast_packet {
    uint8_t  orig[6];
    uint8_t  ttl;
    uint32_t seqno;
-} __attribute__((packed));
+} __packed;
struct vis_packet {
    uint8_t  packet_type;
@@ -131,6 +131,6 @@ struct vis_packet {
    			  * neighbors */
    uint8_t  target_orig[6]; /* who should receive this packet */
    uint8_t  sender_orig[6]; /* who sent or rebroadcasted this packet */
-} __attribute__((packed));
+} __packed;
#endif /* _NET_BATMAN_ADV_PACKET_H_ */
-- 
batctl

    