summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-04 18:07:59 +0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-04 18:07:59 +0400
commit5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 (patch)
treef18d6efa3832d8d0c62053670e689e6f4e9c02d4
parent5ee882f153a49098a12f6b26f153ba12a33d767a (diff)
downloadlinux-5da0458900bb5f56eb5e7a7c5ed275b5eaf51762.tar.xz
Use __uXX types in <linux/divert.h> for struct divert_blk et al.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/linux/divert.h20
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_src[MAX_DIVERT_PORTS]; /* specific tcp src 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 tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst 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_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */
};
/*
@@ -40,12 +40,12 @@ struct divert_blk
typedef union _divert_cf_arg
{
- s16 int16;
- u16 uint16;
- s32 int32;
- u32 uint32;
- s64 int64;
- u64 uint64;
+ __s16 int16;
+ __u16 uint16;
+ __s32 int32;
+ __u32 uint32;
+ __s64 int64;
+ __u64 uint64;
void __user *ptr;
} divert_cf_arg;