Commit 9adfbfb6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ingo Molnar
Browse files

make most exported headers use strict integer types 



This takes care of all files that have only a small number
of non-strict integer type uses.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: netdev@vger.kernel.org
Cc: linux-ppp@vger.kernel.org
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 85efde6f

include/linux/atmlec.h

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/atmioc.h>

#include <linux/atm.h>

#include <linux/if_ether.h>

#include <linux/types.h>



/* ATM lec daemon control socket */

#define ATMLEC_CTRL	_IO('a', ATMIOC_LANE)
@@ -78,8 +79,8 @@ struct atmlec_msg { 
		} normal;

		struct atmlec_config_msg config;

		struct {

			uint16_t lec_id;			/* requestor lec_id  */

			uint32_t tran_id;			/* transaction id    */

			__u16 lec_id;				/* requestor lec_id  */

			__u32 tran_id;				/* transaction id    */

			unsigned char mac_addr[ETH_ALEN];	/* dst mac addr      */

			unsigned char atm_addr[ATM_ESA_LEN];	/* reqestor ATM addr */

		} proxy;	/*

include/linux/atmmpc.h

+23 −22
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/atmapi.h>

#include <linux/atmioc.h>

#include <linux/atm.h>

#include <linux/types.h>



#define ATMMPC_CTRL _IO('a', ATMIOC_MPOA)

#define ATMMPC_DATA _IO('a', ATMIOC_MPOA+1)
@@ -18,39 +19,39 @@ struct atmmpc_ioc { 
};



typedef struct in_ctrl_info {

        uint8_t   Last_NHRP_CIE_code;

        uint8_t   Last_Q2931_cause_value;     

        uint8_t   eg_MPC_ATM_addr[ATM_ESA_LEN];

        __u8   Last_NHRP_CIE_code;

        __u8   Last_Q2931_cause_value;

        __u8   eg_MPC_ATM_addr[ATM_ESA_LEN];

        __be32  tag;

        __be32  in_dst_ip;      /* IP address this ingress MPC sends packets to */

        uint16_t  holding_time;

        uint32_t  request_id;

        __u16  holding_time;

        __u32  request_id;

} in_ctrl_info;



typedef struct eg_ctrl_info {

        uint8_t   DLL_header[256];

        uint8_t   DH_length;

        __u8   DLL_header[256];

        __u8   DH_length;

        __be32  cache_id;

        __be32  tag;

        __be32  mps_ip;

        __be32  eg_dst_ip;      /* IP address to which ingress MPC sends packets */

        uint8_t   in_MPC_data_ATM_addr[ATM_ESA_LEN];

        uint16_t  holding_time;

        __u8   in_MPC_data_ATM_addr[ATM_ESA_LEN];

        __u16  holding_time;

} eg_ctrl_info;



struct mpc_parameters {

        uint16_t mpc_p1;   /* Shortcut-Setup Frame Count    */

        uint16_t mpc_p2;   /* Shortcut-Setup Frame Time     */

        uint8_t mpc_p3[8]; /* Flow-detection Protocols      */

        uint16_t mpc_p4;   /* MPC Initial Retry Time        */

        uint16_t mpc_p5;   /* MPC Retry Time Maximum        */

        uint16_t mpc_p6;   /* Hold Down Time                */      

        __u16 mpc_p1;   /* Shortcut-Setup Frame Count    */

        __u16 mpc_p2;   /* Shortcut-Setup Frame Time     */

        __u8 mpc_p3[8]; /* Flow-detection Protocols      */

        __u16 mpc_p4;   /* MPC Initial Retry Time        */

        __u16 mpc_p5;   /* MPC Retry Time Maximum        */

        __u16 mpc_p6;   /* Hold Down Time                */

} ;



struct k_message {

        uint16_t type;

        __u16 type;

        __be32 ip_mask;

        uint8_t  MPS_ctrl[ATM_ESA_LEN];

        __u8  MPS_ctrl[ATM_ESA_LEN];

        union {

                in_ctrl_info in_info;

                eg_ctrl_info eg_info;
@@ -61,11 +62,11 @@ struct k_message { 


struct llc_snap_hdr {

	/* RFC 1483 LLC/SNAP encapsulation for routed IP PDUs */

        uint8_t  dsap;    /* Destination Service Access Point (0xAA)     */

        uint8_t  ssap;    /* Source Service Access Point      (0xAA)     */

        uint8_t  ui;      /* Unnumbered Information           (0x03)     */

        uint8_t  org[3];  /* Organizational identification    (0x000000) */

        uint8_t  type[2]; /* Ether type (for IP)              (0x0800)   */

        __u8  dsap;    /* Destination Service Access Point (0xAA)     */

        __u8  ssap;    /* Source Service Access Point      (0xAA)     */

        __u8  ui;      /* Unnumbered Information           (0x03)     */

        __u8  org[3];  /* Organizational identification    (0x000000) */

        __u8  type[2]; /* Ether type (for IP)              (0x0800)   */

};



/* TLVs this MPC recognizes */

include/linux/cm4000_cs.h

+6 −4
Original line number Diff line number Diff line 
#ifndef	_CM4000_H_

#define	_CM4000_H_



#include <linux/types.h>



#define	MAX_ATR			33



#define	CM4000_MAX_DEV		4
@@ -10,9 +12,9 @@ 
 * not to break compilation of userspace apps. -HW */



typedef struct atreq {

	int32_t atr_len;

	__s32 atr_len;

	unsigned char atr[64];

	int32_t power_act;

	__s32 power_act;

	unsigned char bIFSD;

	unsigned char bIFSC;

} atreq_t;
@@ -22,13 +24,13 @@ typedef struct atreq { 
 * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace

 * will lay out the structure members differently than the 64bit kernel.

 *

 * I've changed "ptsreq.protocol" from "unsigned long" to "u_int32_t".

 * I've changed "ptsreq.protocol" from "unsigned long" to "__u32".

 * On 32bit this will make no difference.  With 64bit kernels, it will make

 * 32bit apps work, too.

 */



typedef struct ptsreq {

	u_int32_t protocol; /*T=0: 2^0, T=1:  2^1*/

	__u32 protocol; /*T=0: 2^0, T=1:  2^1*/

 	unsigned char flags;

 	unsigned char pts1;

 	unsigned char pts2;

include/linux/dlm_netlink.h

+10 −8
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef _DLM_NETLINK_H

#define _DLM_NETLINK_H



#include <linux/types.h>



enum {

	DLM_STATUS_WAITING = 1,

	DLM_STATUS_GRANTED = 2,
@@ -18,16 +20,16 @@ enum { 
#define DLM_LOCK_DATA_VERSION 1



struct dlm_lock_data {

	uint16_t version;

	uint32_t lockspace_id;

	__u16 version;

	__u32 lockspace_id;

	int nodeid;

	int ownpid;

	uint32_t id;

	uint32_t remid;

	uint64_t xid;

	int8_t status;

	int8_t grmode;

	int8_t rqmode;

	__u32 id;

	__u32 remid;

	__u64 xid;

	__s8 status;

	__s8 grmode;

	__s8 rqmode;

	unsigned long timestamp;

	int resource_namelen;

	char resource_name[DLM_RESNAME_MAXLEN];

include/linux/dm-ioctl.h

+21 −21
Original line number Diff line number Diff line
@@ -113,20 +113,20 @@ struct dm_ioctl { 
	 * return -ENOTTY) fill out this field, even if the

	 * command failed.

	 */

	uint32_t version[3];	/* in/out */

	uint32_t data_size;	/* total size of data passed in

	__u32 version[3];	/* in/out */

	__u32 data_size;	/* total size of data passed in

				 * including this struct */



	uint32_t data_start;	/* offset to start of data

	__u32 data_start;	/* offset to start of data

				 * relative to start of this struct */



	uint32_t target_count;	/* in/out */

	int32_t open_count;	/* out */

	uint32_t flags;		/* in/out */

	uint32_t event_nr;      	/* in/out */

	uint32_t padding;

	__u32 target_count;	/* in/out */

	__s32 open_count;	/* out */

	__u32 flags;		/* in/out */

	__u32 event_nr;      	/* in/out */

	__u32 padding;



	uint64_t dev;		/* in/out */

	__u64 dev;		/* in/out */



	char name[DM_NAME_LEN];	/* device name */

	char uuid[DM_UUID_LEN];	/* unique identifier for
@@ -139,9 +139,9 @@ struct dm_ioctl { 
 * dm_ioctl.

 */

struct dm_target_spec {

	uint64_t sector_start;

	uint64_t length;

	int32_t status;		/* used when reading from kernel only */

	__u64 sector_start;

	__u64 length;

	__s32 status;		/* used when reading from kernel only */



	/*

	 * Location of the next dm_target_spec.
@@ -153,7 +153,7 @@ struct dm_target_spec { 
	 *   (that follows the dm_ioctl struct) to the start of the "next"

	 *   dm_target_spec.

	 */

	uint32_t next;

	__u32 next;



	char target_type[DM_MAX_TYPE_NAME];
@@ -168,17 +168,17 @@ struct dm_target_spec { 
 * Used to retrieve the target dependencies.

 */

struct dm_target_deps {

	uint32_t count;	/* Array size */

	uint32_t padding;	/* unused */

	uint64_t dev[0];	/* out */

	__u32 count;	/* Array size */

	__u32 padding;	/* unused */

	__u64 dev[0];	/* out */

};



/*

 * Used to get a list of all dm devices.

 */

struct dm_name_list {

	uint64_t dev;

	uint32_t next;		/* offset to the next record from

	__u64 dev;

	__u32 next;		/* offset to the next record from

				   the _start_ of this */

	char name[0];

};
@@ -187,8 +187,8 @@ struct dm_name_list { 
 * Used to retrieve the target versions

 */

struct dm_target_versions {

        uint32_t next;

        uint32_t version[3];

        __u32 next;

        __u32 version[3];



        char name[0];

};
@@ -197,7 +197,7 @@ struct dm_target_versions { 
 * Used to pass message to a target

 */

struct dm_target_msg {

	uint64_t sector;	/* Device sector */

	__u64 sector;	/* Device sector */



	char message[0];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE