diff options
author | Sjur Braendeland <sjur.brandeland@stericsson.com> | 2010-04-28 04:54:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-28 15:55:14 -0400 |
commit | bece7b2398d073d11b2e352405a3ecd3a1e39c60 (patch) | |
tree | 645d3207b985dc7b1b139cfd857ed6de273655ef /include/linux | |
parent | 8d545c8f958f5f433c50a00762ce1f231ed56eee (diff) |
caif: Rewritten socket implementation
Changes:
This is a complete re-write of the socket layer. Making the socket
implementation more aligned with the other socket layers and using more
of the support functions available in sock.c. Lots of code is copied
from af_unix (and some from af_irda).
Non-blocking mode should be working as well.
Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/caif/caif_socket.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/caif/caif_socket.h b/include/linux/caif/caif_socket.h index 8e5c8444a3f4..2a61eb1beb85 100644 --- a/include/linux/caif/caif_socket.h +++ b/include/linux/caif/caif_socket.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <sys/socket.h> | 16 | #include <sys/socket.h> |
17 | #endif | 17 | #endif |
18 | 18 | ||
19 | |||
20 | /** | 19 | /** |
21 | * enum caif_link_selector - Physical Link Selection. | 20 | * enum caif_link_selector - Physical Link Selection. |
22 | * @CAIF_LINK_HIGH_BANDW: Physical interface for high-bandwidth | 21 | * @CAIF_LINK_HIGH_BANDW: Physical interface for high-bandwidth |
@@ -59,7 +58,7 @@ enum caif_channel_priority { | |||
59 | /** | 58 | /** |
60 | * enum caif_protocol_type - CAIF Channel type. | 59 | * enum caif_protocol_type - CAIF Channel type. |
61 | * @CAIFPROTO_AT: Classic AT channel. | 60 | * @CAIFPROTO_AT: Classic AT channel. |
62 | * @CAIFPROTO_DATAGRAM: Datagram channel. | 61 | * @CAIFPROTO_DATAGRAM: Datagram channel. |
63 | * @CAIFPROTO_DATAGRAM_LOOP: Datagram loopback channel, used for testing. | 62 | * @CAIFPROTO_DATAGRAM_LOOP: Datagram loopback channel, used for testing. |
64 | * @CAIFPROTO_UTIL: Utility (Psock) channel. | 63 | * @CAIFPROTO_UTIL: Utility (Psock) channel. |
65 | * @CAIFPROTO_RFM: Remote File Manager | 64 | * @CAIFPROTO_RFM: Remote File Manager |
@@ -87,6 +86,7 @@ enum caif_at_type { | |||
87 | 86 | ||
88 | /** | 87 | /** |
89 | * struct sockaddr_caif - the sockaddr structure for CAIF sockets. | 88 | * struct sockaddr_caif - the sockaddr structure for CAIF sockets. |
89 | * @family: Address family number, must be AF_CAIF. | ||
90 | * @u: Union of address data 'switched' by family. | 90 | * @u: Union of address data 'switched' by family. |
91 | * : | 91 | * : |
92 | * @u.at: Applies when family = CAIFPROTO_AT. | 92 | * @u.at: Applies when family = CAIFPROTO_AT. |
@@ -153,6 +153,7 @@ struct sockaddr_caif { | |||
153 | * | 153 | * |
154 | * | 154 | * |
155 | * This enum defines the CAIF Socket options to be used on a socket | 155 | * This enum defines the CAIF Socket options to be used on a socket |
156 | * of type PF_CAIF. | ||
156 | * | 157 | * |
157 | */ | 158 | */ |
158 | enum caif_socket_opts { | 159 | enum caif_socket_opts { |