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

Showing the changes to include/uapi (1 of 3 files). Show all

Unified · Split

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

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	10	#define __UAPI_MCTP_H
11	11
12	12	#include <linux/types.h>
	13	+#include <linux/socket.h>
13	14
14	15	typedef __u8 mctp_eid_t;
15	16
@@ -18,8 +19,8 @@ struct mctp_addr { · 2 unmodified lines
18	19	};
19	20
20	21	struct sockaddr_mctp {
21		− unsigned short int smctp_family;
22		− int smctp_network;
	22	+ __kernel_sa_family_t smctp_family;
	23	+ unsigned int smctp_network;
23	24	struct mctp_addr smctp_addr;
24	25	__u8 smctp_type;
25	26	__u8 smctp_tag;