1 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/divert.h b/include/linux/divert.h
index 6919b09133d4..8fb4e9de6843 100644
--- a/include/linux/divert.h
+++ b/include/linux/divert.h
@@ -27,10 +27,10 @@ struct divert_blk
 {
        int             divert;  /* are we active */
        unsigned int protos;    /* protocols */
-        u16             tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
+        __u16           tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
-        u16             tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
+        __u16           tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
-        u16             udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
+        __u16           udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
-        u16             udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
+        __u16           udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
 };
 /*
@@ -40,12 +40,12 @@ struct divert_blk
 typedef union _divert_cf_arg
 {
-        s16             int16;
+        __s16           int16;
-        u16             uint16;
+        __u16           uint16;
-        s32             int32;
+        __s32           int32;
-        u32             uint32;
+        __u32           uint32;
-        s64             int64;
+        __s64           int64;
-        u64             uint64;
+        __u64           uint64;
        void    __user *ptr;
 } divert_cf_arg;

diff --git a/include/linux/divert.h b/include/linux/divert.h index 6919b09133d4..8fb4e9de6843 100644 --- a/include/linux/divert.h +++ b/include/linux/divert.h
@@ -27,10 +27,10 @@ struct divert_blk
27	{	27	{
28	int divert; /* are we active */	28	int divert; /* are we active */
29	unsigned int protos; /* protocols */	29	unsigned int protos; /* protocols */
30	u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */	30	__u16 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */
31	u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */	31	__u16 tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */
32	u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */	32	__u16 udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */
33	u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */	33	__u16 udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
34	};	34	};
35		35
36	/*	36	/*
@@ -40,12 +40,12 @@ struct divert_blk
40		40
41	typedef union _divert_cf_arg	41	typedef union _divert_cf_arg
42	{	42	{
43	s16 int16;	43	__s16 int16;
44	u16 uint16;	44	__u16 uint16;
45	s32 int32;	45	__s32 int32;
46	u32 uint32;	46	__u32 uint32;
47	s64 int64;	47	__s64 int64;
48	u64 uint64;	48	__u64 uint64;
49	void __user *ptr;	49	void __user *ptr;
50	} divert_cf_arg;	50	} divert_cf_arg;
51		51