mctp: unify sockaddr_mctp types

Use the more precise __kernel_sa_family_t for smctp_family, to match struct sockaddr. Also, use an unsigned int for the network member; negative networks don't make much sense. We're already using unsigned for mctp_dev and mctp_skb_cb, but need to change mctp_sock to suit.

Jeremy Kerr committed 5 years ago

Commit b416beb1 parent b2cddb43 files · +9 −8Browse files

Unified · Split

3 files

Documentation/networking/mctp.rst +5 −5
include/net/mctp.h +1 −1
include/uapi/linux/mctp.h +3 −2

Documentation/networking/mctp.rst+5−5

@@ -59,11 +59,11 @@ specified with a ``sockaddr`` type, with a single-byte endpoint address: · 58 unmodified lines
59	};	59	};
60		60
61	struct sockaddr_mctp {	61	struct sockaddr_mctp {
62	unsigned short int smctp_family;	62	__kernel_sa_family_t smctp_family;
63	int smctp_network;	63	unsigned int smctp_network;
64	struct mctp_addr smctp_addr;	64	struct mctp_addr smctp_addr;
65	__u8 smctp_type;	65	__u8 smctp_type;
66	__u8 smctp_tag;	66	__u8 smctp_tag;
67	};	67	};
68		68
69	#define MCTP_NET_ANY 0x0	69	#define MCTP_NET_ANY 0x0

include/net/mctp.h+1−1

@@ -54,7 +54,7 @@ struct mctp_sock { · 53 unmodified lines
54	struct sock sk;	54	struct sock sk;
55		55
56	/* bind() params */	56	/* bind() params */
57	int bind_net;	57	unsigned int bind_net;
58	mctp_eid_t bind_addr;	58	mctp_eid_t bind_addr;
59	__u8 bind_type;	59	__u8 bind_type;
60		60

include/uapi/linux/mctp.h+3−2

 #define __UAPI_MCTP_H
 #include <linux/types.h>
+#include <linux/socket.h>
 typedef __u8			mctp_eid_t;
 };
 struct sockaddr_mctp {
-	unsigned short int	smctp_family;
+	__kernel_sa_family_t	smctp_family;
-	int			smctp_network;
+	unsigned int		smctp_network;
 	struct mctp_addr	smctp_addr;
 	__u8			smctp_type;
 	__u8			smctp_tag;

mctp: unify sockaddr_mctp types

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code