From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Wed, 10 Aug 2005 03:26:28 +0000 (-0700)
Subject: [DCCP]: Fix struct sockaddr_dccp definition
X-Git-Tag: v2.6.14-rc1~1035^2~134
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e2e268665f6c01686b477a6b0cc5a70bab689d54;p=linux-2.6-omap-h63xx.git

[DCCP]: Fix struct sockaddr_dccp definition

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index add4908b8e5..fd1412ddb3f 100644
--- a/include/linux/dccp.h
+++ b/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;
 };
 
 /**