 cee4cca740
			
		
	
	
	cee4cca740
	
	
	
		
			
			* git://git.infradead.org/hdrcleanup-2.6: (63 commits) [S390] __FD_foo definitions. Switch to __s32 types in joystick.h instead of C99 types for consistency. Add <sys/types.h> to headers included for userspace in <linux/input.h> Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h Remove struct fddi_statistics from user view in <linux/if_fddi.h> Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390 Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h> Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too Remove private struct dx_hash_info from public view in <linux/ext3_fs.h> Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h> Use __uXX types in <linux/divert.h> for struct divert_blk et al. Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible. Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely Use __uXX types in user-visible structures in <linux/nbd.h> Don't use 'u32' in user-visible struct ip_conntrack_old_tuple. Use __uXX types for S390 DASD volume label definitions which are user-visible S390 BIODASDREADCMB ioctl should use __u64 not u64 type. Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h> Fix private integer types used in V4L2 ioctls. ... Manually resolve conflict in include/linux/mtd/physmap.h
		
			
				
	
	
		
			48 lines
		
	
	
	
		
			1.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
	
		
			1.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * INET		An implementation of the TCP/IP protocol suite for the LINUX
 | |
|  *		operating system.  INET is implemented using the  BSD Socket
 | |
|  *		interface as the means of communication with the user level.
 | |
|  *
 | |
|  *		Definitions for the RAW-IP module.
 | |
|  *
 | |
|  * Version:	@(#)raw.h	1.0.2	05/07/93
 | |
|  *
 | |
|  * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
 | |
|  *
 | |
|  *		This program is free software; you can redistribute it and/or
 | |
|  *		modify it under the terms of the GNU General Public License
 | |
|  *		as published by the Free Software Foundation; either version
 | |
|  *		2 of the License, or (at your option) any later version.
 | |
|  */
 | |
| #ifndef _RAW_H
 | |
| #define _RAW_H
 | |
| 
 | |
| 
 | |
| #include <net/protocol.h>
 | |
| 
 | |
| extern struct proto raw_prot;
 | |
| 
 | |
| extern void 	raw_err(struct sock *, struct sk_buff *, u32 info);
 | |
| extern int 	raw_rcv(struct sock *, struct sk_buff *);
 | |
| 
 | |
| /* Note: v4 ICMP wants to get at this stuff, if you change the
 | |
|  *       hashing mechanism, make sure you update icmp.c as well.
 | |
|  */
 | |
| #define RAWV4_HTABLE_SIZE	MAX_INET_PROTOS
 | |
| extern struct hlist_head raw_v4_htable[RAWV4_HTABLE_SIZE];
 | |
| 
 | |
| extern rwlock_t raw_v4_lock;
 | |
| 
 | |
| 
 | |
| extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
 | |
| 				    __be32 raddr, __be32 laddr,
 | |
| 				    int dif);
 | |
| 
 | |
| extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
 | |
| 
 | |
| #ifdef CONFIG_PROC_FS
 | |
| extern int  raw_proc_init(void);
 | |
| extern void raw_proc_exit(void);
 | |
| #endif
 | |
| 
 | |
| #endif	/* _RAW_H */
 |