Commit b416beb2 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by David S. Miller
Browse files

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.

Fixes: 60fc6398 ("mctp: Add sockaddr_mctp to uapi")
Signed-off-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
Acked-by: default avatarEugene Syromiatnikov <esyr@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2cddb44

Documentation/networking/mctp.rst

+5 −5
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ specified with a ``sockaddr`` type, with a single-byte endpoint address: 
    };



    struct sockaddr_mctp {

            unsigned short int	smctp_family;

            int			smctp_network;

            __kernel_sa_family_t smctp_family;

            unsigned int         smctp_network;

            struct mctp_addr     smctp_addr;

            __u8                 smctp_type;

            __u8                 smctp_tag;

include/net/mctp.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct mctp_sock { 
	struct sock	sk;



	/* bind() params */

	int		bind_net;

	unsigned int	bind_net;

	mctp_eid_t	bind_addr;

	__u8		bind_type;

include/uapi/linux/mctp.h

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define __UAPI_MCTP_H



#include <linux/types.h>

#include <linux/socket.h>



typedef __u8			mctp_eid_t;
@@ -18,8 +19,8 @@ struct mctp_addr { 
};



struct sockaddr_mctp {

	unsigned short int	smctp_family;

	int			smctp_network;

	__kernel_sa_family_t	smctp_family;

	unsigned int		smctp_network;

	struct mctp_addr	smctp_addr;

	__u8			smctp_type;

	__u8			smctp_tag;