--- batman-adv_master.packet.h 2012-05-15 00:15:01.127139896 +0200 +++ batctl_master.packet.h 2012-05-15 00:15:01.219134716 +0200 @@ -1,4 +1,5 @@ -/* 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 * @@ -15,6 +16,7 @@ * 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_ @@ -87,8 +89,7 @@
/* 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, @@ -149,8 +150,7 @@ #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 - */ + * 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 */ @@ -206,8 +206,7 @@ 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]; @@ -215,15 +214,13 @@ * 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 */ + __be16 tt_data; } __packed;
struct roam_adv_packet {
linux-merge@lists.open-mesh.org