From cc0953cf560afe05bb2f559ef3b2ba31b5ac5669 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 4 May 2006 15:07:59 +0100
Subject: [PATCH] --- yaml --- r: 27999 b: refs/heads/master c:
 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762 h: refs/heads/master i:   27997:
 cacef98559f747f92a0ae0ad8ad8b9b3bdf1fcfb   27995:
 ebe3889048326596cc585bc61fbacd315b3224ee   27991:
 d4681a2dfc513c3cb4fb45bea3267bce2a044361   27983:
 01a71a27ff0a7b9f95a2ae8109b96a66ac7c4676   27967:
 b2a7ad93201cd08280efb7e1659f4285fdc40de7 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/divert.h | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 18703162a789..e48fa0e60cad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ee882f153a49098a12f6b26f153ba12a33d767a
+refs/heads/master: 5da0458900bb5f56eb5e7a7c5ed275b5eaf51762
diff --git a/trunk/include/linux/divert.h b/trunk/include/linux/divert.h
index 6919b09133d4..8fb4e9de6843 100644
--- a/trunk/include/linux/divert.h
+++ b/trunk/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;