headers, net: Use __kernel_sa_family_t in more definitions shared with userland (bcb949b8) · Commits · 戴 / test

include/linux/atalk.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@

		#include <linux/types.h>
		#include <asm/byteorder.h>
		#include <linux/socket.h>

		/*
		* AppleTalk networking structures
		@@ -28,7 +29,7 @@ struct atalk_addr {
		};

		struct sockaddr_at {
		sa_family_t sat_family;
		__kernel_sa_family_t sat_family;
		__u8 sat_port;
		struct atalk_addr sat_addr;
		char sat_zero[8];

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ typedef struct {
		} ax25_address;

		struct sockaddr_ax25 {
		sa_family_t sax25_family;
		__kernel_sa_family_t sax25_family;
		ax25_address sax25_call;
		int sax25_ndigis;
		/* Digipeater ax25_address sets follow */

+1 −6

Original line number	Diff line number	Diff line
		@@ -9,12 +9,7 @@
		#define _LINUX_CAIF_SOCKET_H

		#include <linux/types.h>

		#ifdef __KERNEL__
		#include <linux/socket.h>
		#else
		#include <sys/socket.h>
		#endif

		/**
		* 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.
		*/
		struct sockaddr_caif {
		sa_family_t family;
		__kernel_sa_family_t family;
		union {
		struct {
		__u8 type; /* type: enum caif_at_type */

+1 −1

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <linux/types.h>
		#include <asm/byteorder.h>

		#include <linux/socket.h>
		#include <linux/if_ether.h>
		#ifdef __KERNEL__
		#include <linux/if.h>
		@@ -63,7 +64,7 @@ struct pptp_addr {
		#define PX_MAX_PROTO 3

		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 */
		union {
		struct pppoe_addr pppoe;
		@@ -77,7 +78,7 @@ struct sockaddr_pppox {
		* type instead.
		*/
		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 */
		struct pppol2tp_addr pppol2tp;
		} __attribute__((packed));
		@@ -86,7 +87,7 @@ struct sockaddr_pppol2tp {
		* bits. So we need a different sockaddr structure.
		*/
		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 */
		struct pppol2tpv3_addr pppol2tp;
		} __attribute__((packed));