Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / Documentation / networking / mctp.rst

diff --git a/Documentation/networking/mctp.rst b/Documentation/networking/mctp.rst
index 2c54b029f9903795df0d4c6bcc52761753130f32..46f74bffce0f4aa56eb255c61ba9777f4fce6abf 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