From 6f3ab2a2191166405a4d4cec30b55ef2365af7ed Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Tue, 9 Aug 2005 20:26:28 -0700
Subject: [PATCH] --- yaml --- r: 6311 b: refs/heads/master c:
 e2e268665f6c01686b477a6b0cc5a70bab689d54 h: refs/heads/master i:   6309:
 df372a32058a87feecd73a4c3e46e3430daf1ef3   6307:
 cadfa0a195d13b739f20d1d222356f71ae2acef0   6303:
 e7a910558edcb4ac0632e6734f01e83fce7b75fb v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/dccp.h | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4e27813bbd16..2d1497bf8ade 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a47a470e602eecb168ddd3b78841b84ceddd319
+refs/heads/master: e2e268665f6c01686b477a6b0cc5a70bab689d54
diff --git a/trunk/include/linux/dccp.h b/trunk/include/linux/dccp.h
index add4908b8e57..fd1412ddb3ff 100644
--- a/trunk/include/linux/dccp.h
+++ b/trunk/include/linux/dccp.h
@@ -4,10 +4,14 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
-/* FIXME: this is utterly wrong */
+/* Structure describing an Internet (DCCP) socket address. */
 struct sockaddr_dccp {
-	struct sockaddr_in	in;
-	unsigned int		service;
+	__u16	sdccp_family;	/* Address family   */
+	__u16	sdccp_port;	/* Port number	    */
+	__u32	sdccp_addr;	/* Internet address */
+	__u32	sdccp_service;	/* Service	    */
+	/* Pad to size of `struct sockaddr': 16 bytes . */
+	__u32	sdccp_pad;
 };
 
 /**