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: 60fc63981693 ("mctp: Add sockaddr_mctp to uapi")
Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
Acked-by: Eugene Syromiatnikov <esyr@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/mctp.rst b/Documentation/networking/mctp.rst
index 6100cdc220f6b9f1bd9de27729e36c7584942f15..fa7730dbf7b9144793f4ba19c1f1d1fbee623fe9 100644 (file)
--- a/Documentation/networking/mctp.rst
+++ b/Documentation/networking/mctp.rst
@@ -59,11 +59,11 @@ specified with a ``sockaddr`` type, with a single-byte endpoint address:
     };
 
     struct sockaddr_mctp {
-            unsigned short int smctp_family;
-            int                        smctp_network;
-            struct mctp_addr   smctp_addr;
-            __u8               smctp_type;
-            __u8               smctp_tag;
+            __kernel_sa_family_t smctp_family;
+            unsigned int         smctp_network;
+            struct mctp_addr     smctp_addr;
+            __u8                 smctp_type;
+            __u8                 smctp_tag;
     };
 
     #define MCTP_NET_ANY       0x0

diff --git a/include/net/mctp.h b/include/net/mctp.h
index a824d47c3c6d866a31db6d10b7822abe30496edc..ffd2c23bd76d56a58b389abd46a69979405ec132 100644 (file)
--- a/include/net/mctp.h
+++ b/include/net/mctp.h
@@ -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;
 

diff --git a/include/uapi/linux/mctp.h b/include/uapi/linux/mctp.h
index 52b54d13f3850fcd6e95dcc3119a2ad6bd613564..f384962d8ff23ef5e836200f95d07a0e4c1eb582 100644 (file)
--- a/include/uapi/linux/mctp.h
+++ b/include/uapi/linux/mctp.h
@@ -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;