Merge 63500f8dd0 into 7939678070

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>

candump.c

@@ -72,6 +72,9 @@
 #ifndef SO_TIMESTAMPING
 #define SO_TIMESTAMPING 37
 #endif
+#ifndef SCM_TIMESTAMPING
+#define SCM_TIMESTAMPING SO_TIMESTAMPING
+#endif
 
 #define TIMESTAMPSZ 50 /* string 'absolute with date' requires max 49 bytes */
 
@@ -807,13 +810,13 @@ int main(int argc, char **argv)
 			for (cmsg = CMSG_FIRSTHDR(&msg);
 			     cmsg && (cmsg->cmsg_level == SOL_SOCKET);
 			     cmsg = CMSG_NXTHDR(&msg,cmsg)) {
-				if (cmsg->cmsg_type == SO_TIMESTAMP) {
+				if (cmsg->cmsg_type == SCM_TIMESTAMP) {
 					struct timeval tv;
 					memcpy(&tv, CMSG_DATA(cmsg), sizeof(tv));
 					ts.tv_sec = tv.tv_sec;
 					ts.tv_nsec = tv.tv_usec;
 					ts.tv_nsec *= 1000;
-				} else if (cmsg->cmsg_type == SO_TIMESTAMPING) {
+				} else if (cmsg->cmsg_type == SCM_TIMESTAMPING) {
 					struct timespec *stamp = (struct timespec *)CMSG_DATA(cmsg);
 
 					/*

j1939acd.c

@@ -112,10 +112,10 @@ static struct {
 	int sig_alrm;
 	int sig_usr1;
 	int state;
-		#define STATE_INITIAL 0
-		#define STATE_REQ_SENT 1
-		#define STATE_REQ_PENDING 2 /* wait 1250 msec for first claim */
-		#define STATE_OPERATIONAL 3
+#define STATE_INITIAL 0
+#define STATE_REQ_SENT 1
+#define STATE_REQ_PENDING 2 /* wait 1250 msec for first claim */
+#define STATE_OPERATIONAL 3
 } s = {
 	.intf = default_intf,
 	.ranges = default_range,
@@ -126,8 +126,8 @@ static struct {
 struct {
 	uint64_t name;
 	int flags;
-		#define F_USE	0x01
-		#define F_SEEN	0x02
+#define F_USE 0x01
+#define F_SEEN 0x02
 } addr[J1939_IDLE_ADDR /* =254 */];
 
 /* lookup by name */

j1939sr.c

@@ -68,9 +68,9 @@ static struct {
 	int pkt_len;
 	int priority;
 	int defined;
-	#define DEF_SRC		1
-	#define DEF_DST		2
-	#define DEF_PRIO	4
+#define DEF_SRC 1
+#define DEF_DST 2
+#define DEF_PRIO 4
 	struct sockaddr_can src, dst;
 } s = {
 	.priority = 6,

lib.c

@@ -83,8 +83,8 @@ static inline void _put_id(char *buf, int end_offset, canid_t id)
 
 /* CAN DLC to real data length conversion helpers */
 
-static const unsigned char dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,
-					8, 12, 16, 20, 24, 32, 48, 64};
+static const unsigned char dlc2len[] = {
+	0, 1, 2, 3, 4, 5, 6, 7,	8, 12, 16, 20, 24, 32, 48, 64};
 
 /* get data length from raw data length code (DLC) */
 unsigned char can_fd_dlc2len(unsigned char dlc)
@@ -92,7 +92,8 @@ unsigned char can_fd_dlc2len(unsigned char dlc)
 	return dlc2len[dlc & 0x0F];
 }
 
-static const unsigned char len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */
+static const unsigned char len2dlc[] = {
+	0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */
 	9, 9, 9, 9,				/* 9 - 12 */
 	10, 10, 10, 10,				/* 13 - 16 */
 	11, 11, 11, 11,				/* 17 - 20 */