batman-adv: Remove multiline comments from line ending (6e215fd8) · Commits · 戴 / test

net/batman-adv/main.h

+21 −19

Original line number	Diff line number	Diff line
		@@ -34,16 +34,18 @@

		#define TQ_MAX_VALUE 255
		#define JITTER 20
		#define TTL 50 /* Time To Live of broadcast messages */

		#define PURGE_TIMEOUT 200 /* purge originators after time in seconds if no
		* valid packet comes in -> TODO: check
		* influence on TQ_LOCAL_WINDOW_SIZE */
		/* Time To Live of broadcast messages */
		#define TTL 50

		/* purge originators after time in seconds if no valid packet comes in
		* -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */
		#define PURGE_TIMEOUT 200
		#define TT_LOCAL_TIMEOUT 3600 /* in seconds */

		#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator
		* messages in squence numbers (should be a
		* multiple of our word size) */
		/* sliding packet range of received originator messages in squence numbers
		* (should be a multiple of our word size) */
		#define TQ_LOCAL_WINDOW_SIZE 64
		#define TQ_GLOBAL_WINDOW_SIZE 5
		#define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1
		#define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1
		@@ -55,21 +57,20 @@

		#define VIS_INTERVAL 5000 /* 5 seconds */

		/* how much worse secondary interfaces may be to
		* to be considered as bonding candidates */

		/* how much worse secondary interfaces may be to be considered as bonding
		* candidates */
		#define BONDING_TQ_THRESHOLD 50

		#define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or
		* change the size of
		/* should not be bigger than 512 bytes or change the size of
		* forw_packet->direct_link_flags */
		#define MAX_AGGREGATION_BYTES 512
		#define MAX_AGGREGATION_MS 100

		#define SOFTIF_NEIGH_TIMEOUT 180000 /* 3 minutes */

		/* don't reset again within 30 seconds */
		#define RESET_PROTECTION_MS 30000
		#define EXPECTED_SEQNO_RANGE 65536
		/* don't reset again within 30 seconds */

		#define MESH_INACTIVE 0
		#define MESH_ACTIVE 1
		@@ -84,12 +85,13 @@
		#ifdef pr_fmt
		#undef pr_fmt
		#endif
		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* Append 'batman-adv: ' before
		* kernel messages */
		/* Append 'batman-adv: ' before kernel messages */
		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#define DBG_BATMAN 1 /* all messages related to routing / flooding /
		* broadcasting / etc */
		#define DBG_ROUTES 2 /* route or tt entry added / changed / deleted */
		/* all messages related to routing / flooding / broadcasting / etc */
		#define DBG_BATMAN 1
		/* route or tt entry added / changed / deleted */
		#define DBG_ROUTES 2
		#define DBG_ALL 3

net/batman-adv/packet.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -128,8 +128,7 @@ struct vis_packet {
		uint8_t entries; /* number of entries behind this struct */
		uint32_t seqno; /* sequence number */
		uint8_t ttl; /* TTL */
		uint8_t vis_orig[6]; /* originator that informs about its
		* neighbors */
		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;

net/batman-adv/soft-interface.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -793,8 +793,8 @@ static void interface_setup(struct net_device *dev)
		* have not been initialized yet
		*/
		dev->mtu = ETH_DATA_LEN;
		dev->hard_header_len = BAT_HEADER_LEN; /* reserve more space in the
		* skbuff for our header */
		/* reserve more space in the skbuff for our header */
		dev->hard_header_len = BAT_HEADER_LEN;

		/* generate random address */
		random_ether_addr(dev_addr);

net/batman-adv/types.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -89,11 +89,11 @@ struct orig_node {
		struct hlist_node hash_entry;
		struct bat_priv *bat_priv;
		unsigned long last_frag_packet;
		spinlock_t ogm_cnt_lock; /* protects: bcast_own, bcast_own_sum,
		* neigh_node->real_bits,
		* neigh_node->real_packet_count */
		spinlock_t bcast_seqno_lock; /* protects bcast_bits,
		* last_bcast_seqno */
		/* ogm_cnt_lock protects: bcast_own, bcast_own_sum,
		* neigh_node->real_bits, neigh_node->real_packet_count */
		spinlock_t ogm_cnt_lock;
		/* bcast_seqno_lock protects bcast_bits, last_bcast_seqno */
		spinlock_t bcast_seqno_lock;
		atomic_t bond_candidates;
		struct list_head bond_list;
		};

Admin message