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 #include -/* 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; }; /**