Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194607
b: refs/heads/master
c: bece7b2
h: refs/heads/master
i:
  194605: cfcd566
  194603: 28525a4
  194599: 5e60196
  194591: f29f78f
v: v3
  • Loading branch information
Sjur Braendeland authored and David S. Miller committed Apr 28, 2010
1 parent 0523c4e commit d493c8e
Show file tree
Hide file tree
Showing 3 changed files with 832 additions and 970 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8d545c8f958f5f433c50a00762ce1f231ed56eee
refs/heads/master: bece7b2398d073d11b2e352405a3ecd3a1e39c60
5 changes: 3 additions & 2 deletions trunk/include/linux/caif/caif_socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <sys/socket.h>
#endif


/**
* enum caif_link_selector - Physical Link Selection.
* @CAIF_LINK_HIGH_BANDW: Physical interface for high-bandwidth
Expand Down Expand Up @@ -59,7 +58,7 @@ enum caif_channel_priority {
/**
* enum caif_protocol_type - CAIF Channel type.
* @CAIFPROTO_AT: Classic AT channel.
* @CAIFPROTO_DATAGRAM: Datagram channel.
* @CAIFPROTO_DATAGRAM: Datagram channel.
* @CAIFPROTO_DATAGRAM_LOOP: Datagram loopback channel, used for testing.
* @CAIFPROTO_UTIL: Utility (Psock) channel.
* @CAIFPROTO_RFM: Remote File Manager
Expand Down Expand Up @@ -87,6 +86,7 @@ enum caif_at_type {

/**
* struct sockaddr_caif - the sockaddr structure for CAIF sockets.
* @family: Address family number, must be AF_CAIF.
* @u: Union of address data 'switched' by family.
* :
* @u.at: Applies when family = CAIFPROTO_AT.
Expand Down Expand Up @@ -153,6 +153,7 @@ struct sockaddr_caif {
*
*
* This enum defines the CAIF Socket options to be used on a socket
* of type PF_CAIF.
*
*/
enum caif_socket_opts {
Expand Down
Loading

0 comments on commit d493c8e

Please sign in to comment.