Commit aa0adb1a authored by Sven Eckelmann's avatar Sven Eckelmann
Browse files

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: default avatarSven Eckelmann <sven@narfation.org>
parent ed7809d9

net/batman-adv/main.h

+3 −3
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); 
	}							\

	while (0)

#else /* !CONFIG_BATMAN_ADV_DEBUG */

static inline void bat_dbg(char type __attribute__((unused)),

			   struct bat_priv *bat_priv __attribute__((unused)),

			   char *fmt __attribute__((unused)), ...)

static inline void bat_dbg(char type __always_unused,

			   struct bat_priv *bat_priv __always_unused,

			   char *fmt __always_unused, ...)

{

}

#endif

net/batman-adv/packet.h

+7 −7
Original line number Diff line number Diff line
@@ -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_ */

net/batman-adv/types.h

+2 −2
Original line number Diff line number Diff line
@@ -246,13 +246,13 @@ struct vis_info { 
	/* this packet might be part of the vis send queue. */

	struct sk_buff *skb_packet;

	/* vis_info may follow here*/

} __attribute__((packed));

} __packed;



struct vis_info_entry {

	uint8_t  src[ETH_ALEN];

	uint8_t  dest[ETH_ALEN];

	uint8_t  quality;	/* quality = 0 means HNA */

} __attribute__((packed));

} __packed;



struct recvlist_node {

	struct list_head list;

CRA Git | Maintained and supported by SUSTech CRA and CCSE