Patched in Tegra support.

1 files changed, 112 insertions, 175 deletions

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index cb6405bf755..b76b4be10b9 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors:
+/*
+ * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
@@ -15,238 +16,174 @@
  * 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_
 
-enum batadv_packettype {
-        BATADV_IV_OGM           = 0x01,
-        BATADV_ICMP             = 0x02,
-        BATADV_UNICAST          = 0x03,
-        BATADV_BCAST            = 0x04,
-        BATADV_VIS              = 0x05,
-        BATADV_UNICAST_FRAG     = 0x06,
-        BATADV_TT_QUERY         = 0x07,
-        BATADV_ROAM_ADV         = 0x08,
-        BATADV_UNICAST_4ADDR    = 0x09,
-};
+#define ETH_P_BATMAN  0x4305    /* unofficial/not registered Ethertype */
 
-/**
- * enum batadv_subtype - packet subtype for unicast4addr
- * @BATADV_P_DATA: user payload
- * @BATADV_P_DAT_DHT_GET: DHT request message
- * @BATADV_P_DAT_DHT_PUT: DHT store message
- * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT
- */
-enum batadv_subtype {
-        BATADV_P_DATA                   = 0x01,
-        BATADV_P_DAT_DHT_GET            = 0x02,
-        BATADV_P_DAT_DHT_PUT            = 0x03,
-        BATADV_P_DAT_CACHE_REPLY        = 0x04,
+enum bat_packettype {
+        BAT_PACKET       = 0x01,
+        BAT_ICMP         = 0x02,
+        BAT_UNICAST      = 0x03,
+        BAT_BCAST        = 0x04,
+        BAT_VIS          = 0x05,
+        BAT_UNICAST_FRAG = 0x06,
+        BAT_TT_QUERY     = 0x07,
+        BAT_ROAM_ADV     = 0x08
 };
 
 /* this file is included by batctl which needs these defines */
-#define BATADV_COMPAT_VERSION 14
+#define COMPAT_VERSION 14
 
-enum batadv_iv_flags {
-        BATADV_NOT_BEST_NEXT_HOP   = BIT(3),
-        BATADV_PRIMARIES_FIRST_HOP = BIT(4),
-        BATADV_VIS_SERVER          = BIT(5),
-        BATADV_DIRECTLINK          = BIT(6),
+enum batman_flags {
+        PRIMARIES_FIRST_HOP = 1 << 4,
+        VIS_SERVER          = 1 << 5,
+        DIRECTLINK          = 1 << 6
 };
 
 /* ICMP message types */
-enum batadv_icmp_packettype {
-        BATADV_ECHO_REPLY              = 0,
-        BATADV_DESTINATION_UNREACHABLE = 3,
-        BATADV_ECHO_REQUEST            = 8,
-        BATADV_TTL_EXCEEDED            = 11,
-        BATADV_PARAMETER_PROBLEM       = 12,
+enum icmp_packettype {
+        ECHO_REPLY              = 0,
+        DESTINATION_UNREACHABLE = 3,
+        ECHO_REQUEST            = 8,
+        TTL_EXCEEDED            = 11,
+        PARAMETER_PROBLEM       = 12
 };
 
 /* vis defines */
-enum batadv_vis_packettype {
-        BATADV_VIS_TYPE_SERVER_SYNC   = 0,
-        BATADV_VIS_TYPE_CLIENT_UPDATE = 1,
+enum vis_packettype {
+        VIS_TYPE_SERVER_SYNC   = 0,
+        VIS_TYPE_CLIENT_UPDATE = 1
 };
 
 /* fragmentation defines */
-enum batadv_unicast_frag_flags {
-        BATADV_UNI_FRAG_HEAD      = BIT(0),
-        BATADV_UNI_FRAG_LARGETAIL = BIT(1),
+enum unicast_frag_flags {
+        UNI_FRAG_HEAD      = 1 << 0,
+        UNI_FRAG_LARGETAIL = 1 << 1
 };
 
 /* TT_QUERY subtypes */
-#define BATADV_TT_QUERY_TYPE_MASK 0x3
+#define TT_QUERY_TYPE_MASK 0x3
 
-enum batadv_tt_query_packettype {
-        BATADV_TT_REQUEST  = 0,
-        BATADV_TT_RESPONSE = 1,
+enum tt_query_packettype {
+        TT_REQUEST    = 0,
+        TT_RESPONSE   = 1
 };
 
 /* TT_QUERY flags */
-enum batadv_tt_query_flags {
-        BATADV_TT_FULL_TABLE = BIT(2),
+enum tt_query_flags {
+        TT_FULL_TABLE = 1 << 2
 };
 
-/* BATADV_TT_CLIENT flags.
- * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to
- * BIT(15) are used for local computation only
- */
-enum batadv_tt_client_flags {
-        BATADV_TT_CLIENT_DEL     = BIT(0),
-        BATADV_TT_CLIENT_ROAM    = BIT(1),
-        BATADV_TT_CLIENT_WIFI    = BIT(2),
-        BATADV_TT_CLIENT_TEMP    = BIT(3),
-        BATADV_TT_CLIENT_NOPURGE = BIT(8),
-        BATADV_TT_CLIENT_NEW     = BIT(9),
-        BATADV_TT_CLIENT_PENDING = BIT(10),
+/* 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 */
+enum tt_client_flags {
+        TT_CLIENT_DEL     = 1 << 0,
+        TT_CLIENT_ROAM    = 1 << 1,
+        TT_CLIENT_NOPURGE = 1 << 8,
+        TT_CLIENT_NEW     = 1 << 9,
+        TT_CLIENT_PENDING = 1 << 10
 };
 
-/* claim frame types for the bridge loop avoidance */
-enum batadv_bla_claimframe {
-        BATADV_CLAIM_TYPE_CLAIM         = 0x00,
-        BATADV_CLAIM_TYPE_UNCLAIM       = 0x01,
-        BATADV_CLAIM_TYPE_ANNOUNCE      = 0x02,
-        BATADV_CLAIM_TYPE_REQUEST       = 0x03,
-};
-
-/* the destination hardware field in the ARP frame is used to
- * transport the claim type and the group id
- */
-struct batadv_bla_claim_dst {
-        uint8_t magic[3];       /* FF:43:05 */
-        uint8_t type;           /* bla_claimframe */
-        __be16 group;           /* group id */
-};
-
-struct batadv_header {
+struct batman_packet {
         uint8_t  packet_type;
         uint8_t  version;  /* batman version field */
         uint8_t  ttl;
-        /* the parent struct has to add a byte after the header to make
-         * everything 4 bytes aligned again
-         */
-};
-
-struct batadv_ogm_packet {
-        struct batadv_header header;
         uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
-        __be32   seqno;
-        uint8_t  orig[ETH_ALEN];
-        uint8_t  prev_sender[ETH_ALEN];
+        uint32_t seqno;
+        uint8_t  orig[6];
+        uint8_t  prev_sender[6];
         uint8_t  gw_flags;  /* flags related to gateway class */
         uint8_t  tq;
         uint8_t  tt_num_changes;
         uint8_t  ttvn; /* translation table version number */
-        __be16   tt_crc;
+        uint16_t tt_crc;
 } __packed;
 
-#define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)
+#define BAT_PACKET_LEN sizeof(struct batman_packet)
 
-struct batadv_icmp_packet {
-        struct batadv_header header;
+struct icmp_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  msg_type; /* see ICMP message types above */
-        uint8_t  dst[ETH_ALEN];
-        uint8_t  orig[ETH_ALEN];
-        __be16   seqno;
+        uint8_t  dst[6];
+        uint8_t  orig[6];
+        uint16_t seqno;
         uint8_t  uid;
         uint8_t  reserved;
-};
+} __packed;
 
-#define BATADV_RR_LEN 16
+#define BAT_RR_LEN 16
 
 /* icmp_packet_rr must start with all fields from imcp_packet
- * as this is assumed by code that handles ICMP packets
- */
-struct batadv_icmp_packet_rr {
-        struct batadv_header header;
+ * as this is assumed by code that handles ICMP packets */
+struct icmp_packet_rr {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  msg_type; /* see ICMP message types above */
-        uint8_t  dst[ETH_ALEN];
-        uint8_t  orig[ETH_ALEN];
-        __be16   seqno;
+        uint8_t  dst[6];
+        uint8_t  orig[6];
+        uint16_t seqno;
         uint8_t  uid;
         uint8_t  rr_cur;
-        uint8_t  rr[BATADV_RR_LEN][ETH_ALEN];
-};
-
-/* All packet headers in front of an ethernet header have to be completely
- * divisible by 2 but not by 4 to make the payload after the ethernet
- * header again 4 bytes boundary aligned.
- *
- * A packing of 2 is necessary to avoid extra padding at the end of the struct
- * caused by a structure member which is larger than two bytes. Otherwise
- * the structure would not fulfill the previously mentioned rule to avoid the
- * misalignment of the payload after the ethernet header. It may also lead to
- * leakage of information when the padding it not initialized before sending.
- */
-#pragma pack(2)
+        uint8_t  rr[BAT_RR_LEN][ETH_ALEN];
+} __packed;
 
-struct batadv_unicast_packet {
-        struct batadv_header header;
+struct unicast_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  ttvn; /* destination translation table version number */
-        uint8_t  dest[ETH_ALEN];
-        /* "4 bytes boundary + 2 bytes" long to make the payload after the
-         * following ethernet header again 4 bytes boundary aligned
-         */
-};
-
-/**
- * struct batadv_unicast_4addr_packet - extended unicast packet
- * @u: common unicast packet header
- * @src: address of the source
- * @subtype: packet subtype
- */
-struct batadv_unicast_4addr_packet {
-        struct batadv_unicast_packet u;
-        uint8_t src[ETH_ALEN];
-        uint8_t subtype;
-        uint8_t reserved;
-        /* "4 bytes boundary + 2 bytes" long to make the payload after the
-         * following ethernet header again 4 bytes boundary aligned
-         */
-};
+        uint8_t  dest[6];
+} __packed;
 
-struct batadv_unicast_frag_packet {
-        struct batadv_header header;
+struct unicast_frag_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  ttvn; /* destination translation table version number */
-        uint8_t  dest[ETH_ALEN];
+        uint8_t  dest[6];
         uint8_t  flags;
         uint8_t  align;
-        uint8_t  orig[ETH_ALEN];
-        __be16   seqno;
+        uint8_t  orig[6];
+        uint16_t seqno;
 } __packed;
 
-struct batadv_bcast_packet {
-        struct batadv_header header;
+struct bcast_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         uint8_t  reserved;
-        __be32   seqno;
-        uint8_t  orig[ETH_ALEN];
-        /* "4 bytes boundary + 2 bytes" long to make the payload after the
-         * following ethernet header again 4 bytes boundary aligned
-         */
-};
-
-#pragma pack()
+        uint32_t seqno;
+        uint8_t  orig[6];
+} __packed;
 
-struct batadv_vis_packet {
-        struct batadv_header header;
+struct vis_packet {
+        uint8_t  packet_type;
+        uint8_t  version;        /* batman version field */
+        uint8_t  ttl;            /* TTL */
         uint8_t  vis_type;       /* which type of vis-participant sent this? */
-        __be32   seqno;          /* sequence number */
+        uint32_t 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 */
-        uint8_t  target_orig[ETH_ALEN]; /* who should receive this packet */
-        uint8_t  sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */
-};
+        uint8_t  vis_orig[6];    /* originator that announces its neighbors */
+        uint8_t  target_orig[6]; /* who should receive this packet */
+        uint8_t  sender_orig[6]; /* who sent or rebroadcasted this packet */
+} __packed;
 
-struct batadv_tt_query_packet {
-        struct batadv_header header;
+struct tt_query_packet {
+        uint8_t  packet_type;
+        uint8_t  version;  /* batman version field */
+        uint8_t  ttl;
         /* 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];
@@ -254,26 +191,26 @@ struct batadv_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
-         */
-        __be16 tt_data;
+         * if TT_RESPONSE: table_size */
+        uint16_t tt_data;
 } __packed;
 
-struct batadv_roam_adv_packet {
-        struct batadv_header header;
+struct roam_adv_packet {
+        uint8_t  packet_type;
+        uint8_t  version;
+        uint8_t  ttl;
         uint8_t  reserved;
         uint8_t  dst[ETH_ALEN];
         uint8_t  src[ETH_ALEN];
         uint8_t  client[ETH_ALEN];
 } __packed;
 
-struct batadv_tt_change {
+struct tt_change {
         uint8_t flags;
         uint8_t addr[ETH_ALEN];
 } __packed;