GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

headers, net: Use __kernel_sa_family_t in more definitions shared with userland

Browse source 
Complete the work started with commit
6602a4baf4 ('net: Make userland include
of netlink.h more sane').

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2011-08-24 18:43:55 +00:00 • committed by David S. Miller
parent d4b172d2ec
commit bcb949b884
15 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/atalk.h
View file

@ -3,6 +3,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/socket.h>
/* /*
* AppleTalk networking structures * AppleTalk networking structures
@ -28,7 +29,7 @@ struct atalk_addr {
}; };
struct sockaddr_at { struct sockaddr_at {
sa_family_t sat_family; __kernel_sa_family_t sat_family;
__u8 sat_port; __u8 sat_port;
struct atalk_addr sat_addr; struct atalk_addr sat_addr;
char sat_zero[8]; char sat_zero[8];

2
include/linux/ax25.h
View file

@ -47,7 +47,7 @@ typedef struct {
} ax25_address; } ax25_address;
struct sockaddr_ax25 { struct sockaddr_ax25 {
sa_family_t sax25_family; __kernel_sa_family_t sax25_family;
ax25_address sax25_call; ax25_address sax25_call;
int sax25_ndigis; int sax25_ndigis;
/* Digipeater ax25_address sets follow */ /* Digipeater ax25_address sets follow */

7
include/linux/caif/caif_socket.h
View file

@ -9,12 +9,7 @@
#define _LINUX_CAIF_SOCKET_H #define _LINUX_CAIF_SOCKET_H
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
#include <linux/socket.h> #include <linux/socket.h>
#else
#include <sys/socket.h>
#endif
/** /**
* enum caif_link_selector - Physical Link Selection. * enum caif_link_selector - Physical Link Selection.
@ -144,7 +139,7 @@ enum caif_debug_service {
* CAIF Channel. It defines the service to connect to on the modem. * CAIF Channel. It defines the service to connect to on the modem.
*/ */
struct sockaddr_caif { struct sockaddr_caif {
sa_family_t family; __kernel_sa_family_t family;
union { union {
struct { struct {
__u8 type; /* type: enum caif_at_type */ __u8 type; /* type: enum caif_at_type */

2
include/linux/can.h
View file

@ -78,7 +78,7 @@ struct can_frame {
* @can_addr: protocol specific address information * @can_addr: protocol specific address information
*/ */
struct sockaddr_can { struct sockaddr_can {
sa_family_t can_family; __kernel_sa_family_t can_family;
int can_ifindex; int can_ifindex;
union { union {
/* transport protocol class address information (e.g. ISOTP) */ /* transport protocol class address information (e.g. ISOTP) */

7
include/linux/if_pppox.h
View file

@ -20,6 +20,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/socket.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/if.h> #include <linux/if.h>
@ -63,7 +64,7 @@ struct pptp_addr {
#define PX_MAX_PROTO 3 #define PX_MAX_PROTO 3
struct sockaddr_pppox { struct sockaddr_pppox {
sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
union { union {
struct pppoe_addr pppoe; struct pppoe_addr pppoe;
@ -77,7 +78,7 @@ struct sockaddr_pppox {
* type instead. * type instead.
*/ */
struct sockaddr_pppol2tp { struct sockaddr_pppol2tp {
sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tp_addr pppol2tp; struct pppol2tp_addr pppol2tp;
} __attribute__((packed)); } __attribute__((packed));
@ -86,7 +87,7 @@ struct sockaddr_pppol2tp {
* bits. So we need a different sockaddr structure. * bits. So we need a different sockaddr structure.
*/ */
struct sockaddr_pppol2tpv3 { struct sockaddr_pppol2tpv3 {
sa_family_t sa_family; /* address family, AF_PPPOX */ __kernel_sa_family_t sa_family; /* address family, AF_PPPOX */
unsigned int sa_protocol; /* protocol identifier */ unsigned int sa_protocol; /* protocol identifier */
struct pppol2tpv3_addr pppol2tp; struct pppol2tpv3_addr pppol2tp;
} __attribute__((packed)); } __attribute__((packed));

2
include/linux/in.h
View file

@ -182,7 +182,7 @@ struct in_pktinfo {
/* Structure describing an Internet (IP) socket address. */ /* Structure describing an Internet (IP) socket address. */
#define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */ #define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */
struct sockaddr_in { struct sockaddr_in {
sa_family_t sin_family; /* Address family */ __kernel_sa_family_t sin_family; /* Address family */
__be16 sin_port; /* Port number */ __be16 sin_port; /* Port number */
struct in_addr sin_addr; /* Internet address */ struct in_addr sin_addr; /* Internet address */

2
include/linux/ipx.h
View file

@ -7,7 +7,7 @@
#define IPX_MTU 576 #define IPX_MTU 576
struct sockaddr_ipx { struct sockaddr_ipx {
sa_family_t sipx_family; __kernel_sa_family_t sipx_family;
__be16 sipx_port; __be16 sipx_port;
__be32 sipx_network; __be32 sipx_network;
unsigned char sipx_node[IPX_NODE_LEN]; unsigned char sipx_node[IPX_NODE_LEN];

9
include/linux/irda.h
View file

@ -26,12 +26,9 @@
#define KERNEL_IRDA_H #define KERNEL_IRDA_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h>
/* Please do *not* add any #include in this file, this file is /* Note that this file is shared with user space. */
* included as-is in user space.
* Please fix the calling file to properly included needed files before
* this one, or preferably to include <net/irda/irda.h> instead.
* Jean II */
/* Hint bit positions for first hint byte */ /* Hint bit positions for first hint byte */
#define HINT_PNP 0x01 #define HINT_PNP 0x01
@ -125,7 +122,7 @@ enum {
#define LSAP_ANY 0xff #define LSAP_ANY 0xff
struct sockaddr_irda { struct sockaddr_irda {
sa_family_t sir_family; /* AF_IRDA */ __kernel_sa_family_t sir_family; /* AF_IRDA */
__u8 sir_lsap_sel; /* LSAP selector */ __u8 sir_lsap_sel; /* LSAP selector */
__u32 sir_addr; /* Device address */ __u32 sir_addr; /* Device address */
char sir_name[25]; /* Usually <service>:IrDA:TinyTP */ char sir_name[25]; /* Usually <service>:IrDA:TinyTP */

7
include/linux/l2tp.h
View file

@ -8,8 +8,8 @@
#define _LINUX_L2TP_H_ #define _LINUX_L2TP_H_
#include <linux/types.h> #include <linux/types.h>
#ifdef __KERNEL__
#include <linux/socket.h> #include <linux/socket.h>
#ifdef __KERNEL__
#include <linux/in.h> #include <linux/in.h>
#else #else
#include <netinet/in.h> #include <netinet/in.h>
@ -26,14 +26,15 @@
#define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */ #define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */
struct sockaddr_l2tpip { struct sockaddr_l2tpip {
/* The first fields must match struct sockaddr_in */ /* The first fields must match struct sockaddr_in */
sa_family_t l2tp_family; /* AF_INET */ __kernel_sa_family_t l2tp_family; /* AF_INET */
__be16 l2tp_unused; /* INET port number (unused) */ __be16 l2tp_unused; /* INET port number (unused) */
struct in_addr l2tp_addr; /* Internet address */ struct in_addr l2tp_addr; /* Internet address */
__u32 l2tp_conn_id; /* Connection ID of tunnel */ __u32 l2tp_conn_id; /* Connection ID of tunnel */
/* Pad to size of `struct sockaddr'. */ /* Pad to size of `struct sockaddr'. */
unsigned char __pad[sizeof(struct sockaddr) - sizeof(sa_family_t) - unsigned char __pad[sizeof(struct sockaddr) -
sizeof(__kernel_sa_family_t) -
sizeof(__be16) - sizeof(struct in_addr) - sizeof(__be16) - sizeof(struct in_addr) -
sizeof(__u32)]; sizeof(__u32)];
}; };

10
include/linux/llc.h
View file

@ -12,16 +12,20 @@
* *
* See the GNU General Public License for more details. * See the GNU General Public License for more details.
*/ */
#include <linux/socket.h>
#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */ #define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */
struct sockaddr_llc { struct sockaddr_llc {
sa_family_t sllc_family; /* AF_LLC */ __kernel_sa_family_t sllc_family; /* AF_LLC */
sa_family_t sllc_arphrd; /* ARPHRD_ETHER */ __kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
unsigned char sllc_test; unsigned char sllc_test;
unsigned char sllc_xid; unsigned char sllc_xid;
unsigned char sllc_ua; /* UA data, only for SOCK_STREAM. */ unsigned char sllc_ua; /* UA data, only for SOCK_STREAM. */
unsigned char sllc_sap; unsigned char sllc_sap;
unsigned char sllc_mac[IFHWADDRLEN]; unsigned char sllc_mac[IFHWADDRLEN];
unsigned char __pad[__LLC_SOCK_SIZE__ - sizeof(sa_family_t) * 2 - unsigned char __pad[__LLC_SOCK_SIZE__ -
sizeof(__kernel_sa_family_t) * 2 -
sizeof(unsigned char) * 4 - IFHWADDRLEN]; sizeof(unsigned char) * 4 - IFHWADDRLEN];
}; };

2
include/linux/netlink.h
View file

@ -1,7 +1,7 @@
#ifndef __LINUX_NETLINK_H #ifndef __LINUX_NETLINK_H
#define __LINUX_NETLINK_H #define __LINUX_NETLINK_H
#include <linux/socket.h> /* for sa_family_t */ #include <linux/socket.h> /* for __kernel_sa_family_t */
#include <linux/types.h> #include <linux/types.h>
#define NETLINK_ROUTE 0 /* Routing/device hook */ #define NETLINK_ROUTE 0 /* Routing/device hook */

5
include/linux/phonet.h
View file

@ -24,6 +24,7 @@
#define LINUX_PHONET_H #define LINUX_PHONET_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h>
/* Automatic protocol selection */ /* Automatic protocol selection */
#define PN_PROTO_TRANSPORT 0 #define PN_PROTO_TRANSPORT 0
@ -96,11 +97,11 @@ struct phonetmsg {
/* Phonet socket address structure */ /* Phonet socket address structure */
struct sockaddr_pn { struct sockaddr_pn {
sa_family_t spn_family; __kernel_sa_family_t spn_family;
__u8 spn_obj; __u8 spn_obj;
__u8 spn_dev; __u8 spn_dev;
__u8 spn_resource; __u8 spn_resource;
__u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; __u8 spn_zero[sizeof(struct sockaddr) - sizeof(__kernel_sa_family_t) - 3];
} __attribute__((packed)); } __attribute__((packed));
/* Well known address */ /* Well known address */

5
include/linux/rose.h
View file

@ -7,6 +7,7 @@
#ifndef ROSE_KERNEL_H #ifndef ROSE_KERNEL_H
#define ROSE_KERNEL_H #define ROSE_KERNEL_H
#include <linux/socket.h>
#include <linux/ax25.h> #include <linux/ax25.h>
#define ROSE_MTU 251 #define ROSE_MTU 251
@ -46,7 +47,7 @@ typedef struct {
} rose_address; } rose_address;
struct sockaddr_rose { struct sockaddr_rose {
sa_family_t srose_family; __kernel_sa_family_t srose_family;
rose_address srose_addr; rose_address srose_addr;
ax25_address srose_call; ax25_address srose_call;
int srose_ndigis; int srose_ndigis;
@ -54,7 +55,7 @@ struct sockaddr_rose {
}; };
struct full_sockaddr_rose { struct full_sockaddr_rose {
sa_family_t srose_family; __kernel_sa_family_t srose_family;
rose_address srose_addr; rose_address srose_addr;
ax25_address srose_call; ax25_address srose_call;
unsigned int srose_ndigis; unsigned int srose_ndigis;

4
include/linux/un.h
View file

@ -1,10 +1,12 @@
#ifndef _LINUX_UN_H #ifndef _LINUX_UN_H
#define _LINUX_UN_H #define _LINUX_UN_H
#include <linux/socket.h>
#define UNIX_PATH_MAX 108 #define UNIX_PATH_MAX 108
struct sockaddr_un { struct sockaddr_un {
sa_family_t sun_family; /* AF_UNIX */ __kernel_sa_family_t sun_family; /* AF_UNIX */
char sun_path[UNIX_PATH_MAX]; /* pathname */ char sun_path[UNIX_PATH_MAX]; /* pathname */
}; };

3
include/linux/x25.h
View file

@ -12,6 +12,7 @@
#define X25_KERNEL_H #define X25_KERNEL_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h>
#define SIOCX25GSUBSCRIP (SIOCPROTOPRIVATE + 0) #define SIOCX25GSUBSCRIP (SIOCPROTOPRIVATE + 0)
#define SIOCX25SSUBSCRIP (SIOCPROTOPRIVATE + 1) #define SIOCX25SSUBSCRIP (SIOCPROTOPRIVATE + 1)
@ -57,7 +58,7 @@ struct x25_address {
* Linux X.25 Address structure, used for bind, and connect mostly. * Linux X.25 Address structure, used for bind, and connect mostly.
*/ */
struct sockaddr_x25 { struct sockaddr_x25 {
sa_family_t sx25_family; /* Must be AF_X25 */ __kernel_sa_family_t sx25_family; /* Must be AF_X25 */
struct x25_address sx25_addr; /* X.121 Address */ struct x25_address sx25_addr; /* X.121 Address */
}; };