Noticed difference in packet.h in master.diff

postmaster at open-mesh.org postmaster at open-mesh.org
Fri Dec 8 00:05:02 CET 2017


--- batman-adv_master.packet.h	2017-12-08 00:05:01.980636617 +0100
+++ batctl_master.packet.h	2017-12-08 00:05:02.048635114 +0100
@@ -24,12 +24,6 @@
 #include <asm/byteorder.h>
 #include <linux/types.h>
 
-/**
- * batadv_tp_is_error() - Check throughput meter return code for error
- * @n: throughput meter return code
- *
- * Return: 0 when not error was detected, != 0 otherwise
- */
 #define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)
 
 /**
@@ -97,15 +91,7 @@
 	BATADV_DIRECTLINK          = BIT(2),
 };
 
-/**
- * enum batadv_icmp_packettype - ICMP message types
- * @BATADV_ECHO_REPLY: success reply to BATADV_ECHO_REQUEST
- * @BATADV_DESTINATION_UNREACHABLE: failure when route to destination not found
- * @BATADV_ECHO_REQUEST: request BATADV_ECHO_REPLY from destination
- * @BATADV_TTL_EXCEEDED: error after BATADV_ECHO_REQUEST traversed too many hops
- * @BATADV_PARAMETER_PROBLEM: return code for malformed messages
- * @BATADV_TP: throughput meter packet
- */
+/* ICMP message types */
 enum batadv_icmp_packettype {
 	BATADV_ECHO_REPLY	       = 0,
 	BATADV_DESTINATION_UNREACHABLE = 3,
@@ -153,14 +139,7 @@
 	BATADV_VLAN_HAS_TAG	= BIT(15),
 };
 
-/**
- * enum batadv_bla_claimframe - claim frame types for the bridge loop avoidance
- * @BATADV_CLAIM_TYPE_CLAIM: claim of a client mac address
- * @BATADV_CLAIM_TYPE_UNCLAIM: unclaim of a client mac address
- * @BATADV_CLAIM_TYPE_ANNOUNCE: announcement of backbone with current crc
- * @BATADV_CLAIM_TYPE_REQUEST: request of full claim table
- * @BATADV_CLAIM_TYPE_LOOPDETECT: mesh-traversing loop detect packet
- */
+/* claim frame types for the bridge loop avoidance */
 enum batadv_bla_claimframe {
 	BATADV_CLAIM_TYPE_CLAIM		= 0x00,
 	BATADV_CLAIM_TYPE_UNCLAIM	= 0x01,


More information about the linux-merge mailing list