[IPV4]: inet_diag annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 11 insertions, 11 deletions

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index a4606e5810e5..6e8bc548635a 100644
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -9,10 +9,10 @@
 
 /* Socket identity */
 struct inet_diag_sockid {
-        __u16   idiag_sport;
-        __u16   idiag_dport;
-        __u32   idiag_src[4];
-        __u32   idiag_dst[4];
+        __be16  idiag_sport;
+        __be16  idiag_dport;
+        __be32  idiag_src[4];
+        __be32  idiag_dst[4];
         __u32   idiag_if;
         __u32   idiag_cookie[2];
 #define INET_DIAG_NOCOOKIE (~0U)
@@ -67,7 +67,7 @@ struct inet_diag_hostcond {
         __u8    family;
         __u8    prefix_len;
         int     port;
-        __u32   addr[0];
+        __be32  addr[0];
 };
 
 /* Base info structure. It contains socket identity (addrs/ports/cookie)
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 492858e6faf0..77761ac4f7bb 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -36,8 +36,8 @@
 static const struct inet_diag_handler **inet_diag_table;
 
 struct inet_diag_entry {
-        u32 *saddr;
-        u32 *daddr;
+        __be32 *saddr;
+        __be32 *daddr;
         u16 sport;
         u16 dport;
         u16 family;
@@ -294,7 +294,7 @@ out:
         return err;
 }
 
-static int bitstring_match(const u32 *a1, const u32 *a2, int bits)
+static int bitstring_match(const __be32 *a1, const __be32 *a2, int bits)
 {
         int words = bits >> 5;
 
@@ -305,8 +305,8 @@ static int bitstring_match(const u32 *a1, const u32 *a2, int bits)
                         return 0;
         }
         if (bits) {
-                __u32 w1, w2;
-                __u32 mask;
+                __be32 w1, w2;
+                __be32 mask;
 
                 w1 = a1[words];
                 w2 = a2[words];
@@ -352,7 +352,7 @@ static int inet_diag_bc_run(const void *bc, int len,
                 case INET_DIAG_BC_S_COND:
                 case INET_DIAG_BC_D_COND: {
                         struct inet_diag_hostcond *cond;
-                        u32 *addr;
+                        __be32 *addr;
 
                         cond = (struct inet_diag_hostcond *)(op + 1);
                         if (cond->port != -1 &&