1 files changed, 26 insertions, 23 deletions

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 0ee1af770798..e562414c2940 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -1,5 +1,4 @@
-/*
- * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -16,13 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA
- *
  */
 
 #ifndef _NET_BATMAN_ADV_PACKET_H_
 #define _NET_BATMAN_ADV_PACKET_H_
 
-#define ETH_P_BATMAN  0x4305    /* unofficial/not registered Ethertype */
+#define BATADV_ETH_P_BATMAN  0x4305 /* unofficial/not registered Ethertype */
 
 enum bat_packettype {
         BAT_IV_OGM       = 0x01,
@@ -36,7 +34,7 @@ enum bat_packettype {
 };
 
 /* this file is included by batctl which needs these defines */
-#define COMPAT_VERSION 14
+#define BATADV_COMPAT_VERSION 14
 
 enum batman_iv_flags {
         NOT_BEST_NEXT_HOP   = 1 << 3,
@@ -67,7 +65,7 @@ enum unicast_frag_flags {
 };
 
 /* TT_QUERY subtypes */
-#define TT_QUERY_TYPE_MASK 0x3
+#define BATADV_TT_QUERY_TYPE_MASK 0x3
 
 enum tt_query_packettype {
         TT_REQUEST    = 0,
@@ -81,7 +79,8 @@ enum tt_query_flags {
 
 /* TT_CLIENT flags.
  * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to
- * 1 << 15 are used for local computation only */
+ * 1 << 15 are used for local computation only
+ */
 enum tt_client_flags {
         TT_CLIENT_DEL     = 1 << 0,
         TT_CLIENT_ROAM    = 1 << 1,
@@ -105,7 +104,7 @@ enum bla_claimframe {
 struct bla_claim_dst {
         uint8_t magic[3];       /* FF:43:05 */
         uint8_t type;           /* bla_claimframe */
-        uint16_t group;         /* group id */
+        __be16 group;           /* group id */
 } __packed;
 
 struct batman_header {
@@ -117,41 +116,42 @@ struct batman_header {
 struct batman_ogm_packet {
         struct batman_header header;
         uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
-        uint32_t seqno;
+        __be32   seqno;
         uint8_t  orig[ETH_ALEN];
         uint8_t  prev_sender[ETH_ALEN];
         uint8_t  gw_flags;  /* flags related to gateway class */
         uint8_t  tq;
         uint8_t  tt_num_changes;
         uint8_t  ttvn; /* translation table version number */
-        uint16_t tt_crc;
+        __be16   tt_crc;
 } __packed;
 
-#define BATMAN_OGM_HLEN sizeof(struct batman_ogm_packet)
+#define BATADV_OGM_HLEN sizeof(struct batman_ogm_packet)
 
 struct icmp_packet {
         struct batman_header header;
         uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[ETH_ALEN];
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
         uint8_t  uid;
         uint8_t  reserved;
 } __packed;
 
-#define BAT_RR_LEN 16
+#define BATADV_RR_LEN 16
 
 /* icmp_packet_rr must start with all fields from imcp_packet
- * as this is assumed by code that handles ICMP packets */
+ * as this is assumed by code that handles ICMP packets
+ */
 struct icmp_packet_rr {
         struct batman_header header;
         uint8_t  msg_type; /* see ICMP message types above */
         uint8_t  dst[ETH_ALEN];
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
         uint8_t  uid;
         uint8_t  rr_cur;
-        uint8_t  rr[BAT_RR_LEN][ETH_ALEN];
+        uint8_t  rr[BATADV_RR_LEN][ETH_ALEN];
 } __packed;
 
 struct unicast_packet {
@@ -167,20 +167,20 @@ struct unicast_frag_packet {
         uint8_t  flags;
         uint8_t  align;
         uint8_t  orig[ETH_ALEN];
-        uint16_t seqno;
+        __be16   seqno;
 } __packed;
 
 struct bcast_packet {
         struct batman_header header;
         uint8_t  reserved;
-        uint32_t seqno;
+        __be32   seqno;
         uint8_t  orig[ETH_ALEN];
 } __packed;
 
 struct vis_packet {
         struct batman_header header;
         uint8_t  vis_type;       /* which type of vis-participant sent this? */
-        uint32_t seqno;          /* sequence number */
+        __be32   seqno;          /* sequence number */
         uint8_t  entries;        /* number of entries behind this struct */
         uint8_t  reserved;
         uint8_t  vis_orig[ETH_ALEN];    /* originator reporting its neighbors */
@@ -192,7 +192,8 @@ struct tt_query_packet {
         struct batman_header header;
         /* the flag field is a combination of:
          * - TT_REQUEST or TT_RESPONSE
-         * - TT_FULL_TABLE */
+         * - TT_FULL_TABLE
+         */
         uint8_t  flags;
         uint8_t  dst[ETH_ALEN];
         uint8_t  src[ETH_ALEN];
@@ -200,13 +201,15 @@ struct tt_query_packet {
          * if TT_REQUEST: ttvn that triggered the
          *                request
          * if TT_RESPONSE: new ttvn for the src
-         *                 orig_node */
+         *                 orig_node
+         */
         uint8_t  ttvn;
         /* tt_data field is:
          * if TT_REQUEST: crc associated with the
          *                ttvn
-         * if TT_RESPONSE: table_size */
-        uint16_t tt_data;
+         * if TT_RESPONSE: table_size
+         */
+        __be16 tt_data;
 } __packed;
 
 struct roam_adv_packet {